]> asedeno.scripts.mit.edu Git - git.git/commitdiff
projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 27b4070)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 Mar 2008 08:34:39 +0000 (00:34 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 Mar 2008 08:34:39 +0000 (00:34 -0800)
* 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()


No differences found
local clone of git.git