projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
ec73962
)
Merge my and Petr's git-merge-one-file-script modifications
author
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:54:23 +0000
(16:54 -0700)
committer
Linus Torvalds
<torvalds@ppc970.osdl.org>
Wed, 8 Jun 2005 23:54:23 +0000
(16:54 -0700)
git-merge-one-file-script
patch
|
blob
|
history
diff --git
a/git-merge-one-file-script
b/git-merge-one-file-script
index
73e1c50
..
f0353c1
100755
(executable)
--- 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"
;;
#