diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-04-20 15:49:37 -0700 |
| commit | bb52e7f600c9732c624ffc27f8321f55c4b4d90b (patch) | |
| tree | 067f898b3e11d5453db20e3b521d84711bfff93d | |
| parent | Merge branch 'jb/am-include' (diff) | |
| parent | am -3: list the paths that needed 3-way fallback (diff) | |
| download | tgif-bb52e7f600c9732c624ffc27f8321f55c4b4d90b.tar.xz | |
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
| -rwxr-xr-x | git-am.sh | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -139,6 +139,12 @@ fall_back_3way () { say Using index info to reconstruct a base tree... cmd='GIT_INDEX_FILE="$dotest/patch-merge-tmp-index"' + + if test -z "$GIT_QUIET" + then + eval "$cmd git diff-index --cached --diff-filter=AM --name-status HEAD" + fi + cmd="$cmd git apply --cached $git_apply_opt"' <"$dotest/patch"' if eval "$cmd" then |