projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8e105e3 32a9023)
Merge branch 'jc/maint-add-p-coalesce-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 May 2009 22:00:15 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 May 2009 22:00:15 +0000 (15:00 -0700)
commit659f09689614d3d745b9aea746672bf43216d294
tree57ce3a29e22e446ef495771f7946fa7fad3fbc87tree | snapshot
parent8e105e3928fccb8038a542ee7fb5986b7ec48eb9commit | diff
parent32a90233d147bd697b338326bd1fabf9edc3f1fecommit | diff
Merge branch 'jc/maint-add-p-coalesce-fix'

* jc/maint-add-p-coalesce-fix:
  t3701: ensure correctly set up repository after skipped tests
  Revert "git-add--interactive: remove hunk coalescing"
  Splitting a hunk that adds a line at the top fails in "add -p"
Git—the stupid content tracker