![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 69a97f1)
raw | patch | inline | side by side (parent: 69a97f1)
| author | Linus Torvalds <torvalds@g5.osdl.org> | |
| Sat, 9 Jul 2005 00:38:44 +0000 (17:38 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Sat, 9 Jul 2005 00:38:44 +0000 (17:38 -0700) |
It used to do "Merge $3" as the message, but that ends up being
inconvenient, and much more easily done inside git-pull-script instead.
This makes the third argument to "git resolve" much easier to explain.
inconvenient, and much more easily done inside git-pull-script instead.
This makes the third argument to "git resolve" much easier to explain.
| git-pull-script | patch | blob | history | |
| git-resolve-script | patch | blob | history |
diff --git a/git-pull-script b/git-pull-script
index 0ef6be3547fe75b1758120161e1e3318b56ee6f4..8e309fc98b97659d08061b0e1f1e6d4f1e43fc32 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
git-resolve-script \
"$(cat "$GIT_DIR"/HEAD)" \
"$(cat "$GIT_DIR"/FETCH_HEAD)" \
- "$merge_name"
+ "Merge $merge_name"
diff --git a/git-resolve-script b/git-resolve-script
index 03c15a98b0527375d34f3369ab1cadb2f6bfc82c..fffcb07df3d020592c79de189ea2d762b0df7232 100755 (executable)
--- a/git-resolve-script
+++ b/git-resolve-script
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" \
# 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-name>"
+if [ -z "$head" -o -z "$merge" -o -z "$merge_msg" ]; then
+ die "git-resolve-script <head> <remote> <merge-message>"
fi
dropheads
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"