projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/gitk/gitk
[git.git]
/
git-resolve-script
diff --git
a/git-resolve-script
b/git-resolve-script
index
03c15a9
..
fffcb07
100755
(executable)
--- a/
git-resolve-script
+++ b/
git-resolve-script
@@
-8,7
+8,7
@@
head=$(git-rev-parse --revs-only "$1")
merge=$(git-rev-parse --revs-only "$2")
head=$(git-rev-parse --revs-only "$1")
merge=$(git-rev-parse --revs-only "$2")
-merge_
repo
="$3"
+merge_
msg
="$3"
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \
dropheads() {
rm -f -- "$GIT_DIR/MERGE_HEAD" \
@@
-19,8
+19,8
@@
dropheads() {
# The remote name is just used for the message,
# but we do want it.
#
# The remote name is just used for the message,
# but we do want it.
#
-if [ -z "$head" -o -z "$merge" -o -z "$merge_
repo
" ]; then
- die "git-resolve-script <head> <remote> <merge-
repo-nam
e>"
+if [ -z "$head" -o -z "$merge" -o -z "$merge_
msg
" ]; then
+ die "git-resolve-script <head> <remote> <merge-
messag
e>"
fi
dropheads
fi
dropheads
@@
-47,7
+47,6
@@
if [ "$common" == "$head" ]; then
fi
echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1
fi
echo "Trying to merge $merge into $head"
git-read-tree -u -m $common $head $merge || exit 1
-merge_msg="Merge $merge_repo"
result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"
result_tree=$(git-write-tree 2> /dev/null)
if [ $? -ne 0 ]; then
echo "Simple merge failed, trying Automatic merge"