Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] Support cloning packed repo from dumb http servers.
[gitweb.git]
/
git-resolve-script
diff --git
a/git-resolve-script
b/git-resolve-script
index fffcb07df3d020592c79de189ea2d762b0df7232..52dd83bae0d6ca95cc083cd6df06a289c51558a5 100755
(executable)
--- a/
git-resolve-script
+++ b/
git-resolve-script
@@
-6,8
+6,8
@@
#
. git-sh-setup-script || die "Not a git archive"
-head=$(git-rev-parse --
revs-onl
y "$1")
-merge=$(git-rev-parse --
revs-onl
y "$2")
+head=$(git-rev-parse --
verif
y "$1")
+merge=$(git-rev-parse --
verif
y "$2")
merge_msg="$3"
dropheads() {