projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 334dde8 5d86861)
Merge branch 'jc/am-report-3way'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:49:37 +0000 (15:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:49:37 +0000 (15:49 -0700)
commitbb52e7f600c9732c624ffc27f8321f55c4b4d90b
tree067f898b3e11d5453db20e3b521d84711bfff93dtree | snapshot
parent334dde8532c68dfcadefbc3a7d96a499c0ec1445commit | diff
parent5d86861c925f15676a14b54062725eb11a85ffbccommit | diff
Merge branch 'jc/am-report-3way'

When "git am -3" needs to fall back to an application to a synthesized
preimage followed by a 3-way merge, the paths that needed such treatment
are now reported to the end user, so that the result in them can be
eyeballed with extra care.

* jc/am-report-3way:
  am -3: list the paths that needed 3-way fallback
git-am.sh diff1 | diff2 | blob | history
Git—the stupid content tracker