Merge branch 'maint'

* maint:
  Fix 'git remote show' regression on empty repository in 1.5.4
  Fix incorrect wording in git-merge.txt.
  git-merge.sh: better handling of combined --squash,--no-ff,--no-commit options
  Fix random crashes in http_cleanup()

diff --cc builtin-ls-remote.c
index 023754986e347a9529d6295d600f665f32f14577,720280e3900dc65a5063306a55880b8bc1330c2a..8907a89d6c3914f4652ef387776f581015778396
--- 1/builtin-ls-remote.c
--- 2/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@@ -94,11 -94,6 +94,8 @@@ int cmd_ls_remote(int argc, const char 
                transport_set_option(transport, TRANS_OPT_UPLOADPACK, uploadpack);
  
        ref = transport_get_remote_refs(transport);
-       transport_disconnect(transport);
- 
-       if (!ref)
++      if (transport_disconnect(transport))
 +              return 1;
- 
        for ( ; ref; ref = ref->next) {
                if (!check_ref_type(ref, flags))
                        continue;

diff --cc http.c
Simple merge