projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 259bcfb ff00b68)
Merge branch 'jc/maint-reset-unmerged-path'
authorJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 22:00:08 +0000 (15:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 1 Aug 2011 22:00:08 +0000 (15:00 -0700)
* jc/maint-reset-unmerged-path:
  reset [<commit>] paths...: do not mishandle unmerged paths

1  2 
diff-lib.c patch | diff1 | diff2 | blob | history

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