projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 253348b 9969454)
Merge branch 'jc/maint-combined-diff-work-tree'
authorJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:25:59 +0000 (17:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 18 Aug 2011 00:25:59 +0000 (17:25 -0700)
commit660578d4da9d71fbc1e553c95d18987b40af5f0f
tree6d353cd12cf5cf928cb2df3c49ba83e0fbbef6b3tree | snapshot
parent253348b2dbb6519c82e6bc3543c652b9727771edcommit | diff
parent99694544358b74c14982f2b9769f8804f017672ccommit | diff
Merge branch 'jc/maint-combined-diff-work-tree'

* jc/maint-combined-diff-work-tree:
  diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"

Conflicts:
combine-diff.c
combine-diff.c diff1 | diff2 | blob | history
Git—the stupid content tracker