projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4176537 bf74106)
Merge branch 'do/maint-merge-recursive-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:43 +0000 (19:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 26 May 2009 02:03:43 +0000 (19:03 -0700)
* do/maint-merge-recursive-fix:
  merge-recursive: never leave index unmerged while recursing

1  2 
merge-recursive.c patch | diff1 | diff2 | blob | history

diff --cc merge-recursive.c
Simple merge
Git—the stupid content tracker