projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-one-file: use common as base, instead of emptiness.
[git.git]
/
git-merge-one-file.sh
diff --git
a/git-merge-one-file.sh
b/git-merge-one-file.sh
index
32e17cb
..
d9ee458
100755
(executable)
--- a/
git-merge-one-file.sh
+++ b/
git-merge-one-file.sh
@@
-57,18
+57,20
@@
case "${1:-.}${2:-.}${3:-.}" in
# Modified in both, but differently.
#
"$1$2$3" | ".$2$3")
# Modified in both, but differently.
#
"$1$2$3" | ".$2$3")
+ src2=`git-unpack-file $3`
case "$1" in
'')
echo "Added $4 in both, but differently."
case "$1" in
'')
echo "Added $4 in both, but differently."
+ # This extracts OUR file in $orig, and uses git-apply to
+ # remove lines that are unique to ours.
orig=`git-unpack-file $2`
orig=`git-unpack-file $2`
- : >$orig
+ diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add
;;
*)
echo "Auto-merging $4."
orig=`git-unpack-file $1`
;;
esac
;;
*)
echo "Auto-merging $4."
orig=`git-unpack-file $1`
;;
esac
- src2=`git-unpack-file $3`
# We reset the index to the first branch, making
# git-diff-file useful
# We reset the index to the first branch, making
# git-diff-file useful