projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
* 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"


Trivial merge
Git—the stupid content tracker