From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 4 Mar 2008 08:34:39 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~66
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=27b4070e40a771c41ed581ef1ac98dd43e58ab87;hp=27b4070e40a771c41ed581ef1ac98dd43e58ab87;p=git.git

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()
---