diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 04:38:44 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 04:38:44 +0400 |
| commit | 3ba513c32e7b9102187d94d1c43f33d9559fb334 (patch) | |
| tree | 8121f48b07e68ea9fb3e5c1c7b6d4b68b915bca5 /git-pull-script | |
| parent | 69a97f1d9bb9455b634564e91f33479ffc35c02b (diff) | |
Make "git resolve" take the merge message in $3
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.
Diffstat (limited to 'git-pull-script')
| -rwxr-xr-x | git-pull-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull-script b/git-pull-script index 0ef6be3547..8e309fc98b 100755 --- a/git-pull-script +++ b/git-pull-script @@ -22,4 +22,4 @@ git-fetch-script "$merge_repo" "$merge_head" || exit 1 git-resolve-script \ "$(cat "$GIT_DIR"/HEAD)" \ "$(cat "$GIT_DIR"/FETCH_HEAD)" \ - "$merge_name" + "Merge $merge_name" |