projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 36bad9d 9969454)
Merge branch 'jc/maint-combined-diff-work-tree' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Aug 2011 22:27:30 +0000 (15:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Aug 2011 22:27:30 +0000 (15:27 -0700)
commitc9321a0e20f3461cf4ae07a8320aa80480107f24
tree9f8003bd492baaff2eadd7fa0a1e441cdea43a8ctree | snapshot
parent36bad9dee0a729f6205ceba3b059139162e01ab5commit | diff
parent99694544358b74c14982f2b9769f8804f017672ccommit | diff
Merge branch 'jc/maint-combined-diff-work-tree' into maint

* 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