Junio C Hamano 27b4070e40 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()

2008-03-04 00:34:39 -08:00

14 KiB

Raw Blame History

View Raw