projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cea08ed 9969454)
Merge branch 'jc/maint-combined-diff-work-tree' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 22:06:51 +0000 (15:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Aug 2011 22:06:51 +0000 (15:06 -0700)
commit976a4d4f8af9255c50ec80976fda3c5e2eb1f6ea
treeeb0d835c001cd4e7d27e8bf66847e3b804ff4868tree | snapshot
parentcea08ed783e9348b7e312b2ad58a14d4eb4a6eaecommit | diff
parent99694544358b74c14982f2b9769f8804f017672ccommit | diff
Merge branch 'jc/maint-combined-diff-work-tree' into next

* 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
Unnamed repository; edit this file 'description' to name the repository.