projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] When copying or renaming, keep the mode, please
[git.git]
/
git-resolve-script
diff --git
a/git-resolve-script
b/git-resolve-script
index
fffcb07
..
4641119
100755
(executable)
--- a/
git-resolve-script
+++ b/
git-resolve-script
@@
-6,8
+6,8
@@
#
. git-sh-setup-script || die "Not a git archive"
#
. git-sh-setup-script || die "Not a git archive"
-head=$(git-rev-parse --
revs-only "$1")
-merge=$(git-rev-parse --
revs-only "$2")
+head=$(git-rev-parse --
verify "$1"^0) || exit
+merge=$(git-rev-parse --
verify "$2"^0) || exit
merge_msg="$3"
dropheads() {
merge_msg="$3"
dropheads() {