projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Teach git push .git/branches shorthand
[git.git]
/
git-merge-one-file-script
diff --git
a/git-merge-one-file-script
b/git-merge-one-file-script
index
88ad3ed
..
be64c07
100755
(executable)
--- a/
git-merge-one-file-script
+++ b/
git-merge-one-file-script
@@
-22,7
+22,9
@@
case "${1:-.}${2:-.}${3:-.}" in
#
"$1.." | "$1.$1" | "$1$1.")
echo "Removing $4"
#
"$1.." | "$1.$1" | "$1$1.")
echo "Removing $4"
- rm -f -- "$4" &&
+ if test -f "$4"; then
+ rm -f -- "$4"
+ fi &&
exec git-update-cache --remove -- "$4"
;;
exec git-update-cache --remove -- "$4"
;;
@@
-59,7
+61,7
@@
case "${1:-.}${2:-.}${3:-.}" in
# 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
- git-update-cache --add --cacheinfo "$6" "$2" "$4"
+ git-update-cache --add --cacheinfo "$6" "$2" "$4"
git-checkout-cache -u -f -- "$4" &&
merge "$4" "$orig" "$src2"
ret=$?
git-checkout-cache -u -f -- "$4" &&
merge "$4" "$orig" "$src2"
ret=$?