diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-22 00:55:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-22 18:09:07 -0700 |
| commit | c8b48ba4767ff9da19ef4f41f8d870f11742d833 (patch) | |
| tree | 3d0e6f09fd3189d9b684d064529eb81c5128a517 /git-pull.sh | |
| parent | f8ff0c0641a14770a2214fffbd4271b1ea3a0d61 (diff) | |
| download | git-c8b48ba4767ff9da19ef4f41f8d870f11742d833.tar.gz git-c8b48ba4767ff9da19ef4f41f8d870f11742d833.tar.xz | |
Prettyprint octopus merge message.
Including the current branch in the list of heads being merged
was not a good idea, so drop it. And shorten the message by
grouping branches and tags together to form a single line.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/git-pull.sh b/git-pull.sh index 8cf39e7f6..e3d11961b 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -25,10 +25,6 @@ then fi merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ') -merge_name=$( - perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \ - "$GIT_DIR"/FETCH_HEAD -) case "$merge_head" in '') @@ -41,6 +37,5 @@ case "$merge_head" in ;; esac -git-resolve \ - "$(cat "$GIT_DIR"/HEAD)" \ - $merge_head "Merge $merge_name" +merge_name=$(git-fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") +git-resolve "$(cat "$GIT_DIR"/HEAD)" $merge_head "$merge_name" |