projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 630fc78 960ac5f)
Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 27 Jan 2011 18:27:49 +0000 (10:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 27 Jan 2011 18:27:49 +0000 (10:27 -0800)
commit99e63ef24e18c8ca918922b052de96a8ceca48a4
treef51f4546f505b9387b0b44f0cfeee1ed27217ad0tree | snapshot
parent630fc7878b6fd1bc188d4916b64f4df37658df96commit | diff
parent960ac5ff99304404d287b8174d7c8a7743c6d97acommit | diff
Merge branch 'maint'

* maint:
  rebase -i: clarify in-editor documentation of "exec"
  tests: sanitize more git environment variables
  fast-import: treat filemodify with empty tree as delete
  rebase: give a better error message for bogus branch
  rebase: use explicit "--" with checkout

Conflicts:
t/t9300-fast-import.sh
fast-import.c diff1 | diff2 | blob | history
git-rebase--interactive.sh diff1 | diff2 | blob | history
git-rebase.sh diff1 | diff2 | blob | history
t/t9300-fast-import.sh diff1 | diff2 | blob | history
t/test-lib.sh diff1 | diff2 | blob | history
Git—the stupid content tracker