summaryrefslogtreecommitdiff
path: root/git-merge-one-file-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 23:54:23 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 23:54:23 (GMT)
commit566487c8a617c12d68bf22c7078bce0b94fc8121 (patch)
treea0937604a02425fc618e2d2017f4266ca9240052 /git-merge-one-file-script
parentec73962d8e17e89ac0c4b21f07cefe16594e07a2 (diff)
parentae3858e7e9146208f1608445975e2761c9b0482e (diff)
downloadgit-566487c8a617c12d68bf22c7078bce0b94fc8121.zip
git-566487c8a617c12d68bf22c7078bce0b94fc8121.tar.gz
git-566487c8a617c12d68bf22c7078bce0b94fc8121.tar.bz2
Merge my and Petr's git-merge-one-file-script modifications
Diffstat (limited to 'git-merge-one-file-script')
-rwxr-xr-xgit-merge-one-file-script3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-merge-one-file-script b/git-merge-one-file-script
index 73e1c50..f0353c1 100755
--- a/git-merge-one-file-script
+++ b/git-merge-one-file-script
@@ -23,7 +23,8 @@ case "${1:-.}${2:-.}${3:-.}" in
"$1..")
echo "WARNING: $4 is removed in both branches."
echo "WARNING: This is a potential rename conflict."
- exec git-update-cache --remove -- "$4"
+ rm -f -- "$4" &&
+ exec git-update-cache --remove -- "$4"
;;
#