development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-01 06:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-one-file: leave unmerged index entries upon automerge failure.

Browse source 
When automerge fails, we used to collapse the path to stage0
from "our" branch, to help "diff-files" users to view the
half-merged state against the current HEAD.  Now diff-files has
been taught how to compare with unmerged stage2,leaving them
unmerged is a better thing to do, especially this prevents the
unresolved conflicts to be committed by mistake.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Linus Torvalds 2005-11-29 21:06:10 -08:00 committed by Junio C Hamano
parent 10637b84d9
commit 354b9b59b0
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
git-merge-one-file.sh
View file

@ -79,11 +79,7 @@ case "${1:-.}${2:-.}${3:-.}" in
;;
esac
# We reset the index to the first branch, making
# git-diff-file useful
git-update-index --add --cacheinfo "$6" "$2" "$4"
git-checkout-index -u -f -- "$4" &&
merge "$4" "$orig" "$src2"
merge "$4" "$orig" "$src2"
ret=$?
rm -f -- "$orig" "$src2"