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
This commit is contained in:
commit
bb52e7f600
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user