diff options
| author |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 10:09:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 10:09:41 -0700 |
| commit | 5b1ea09de1eb2ae190169ca77e16a79de0e1ede7 (patch) | |
| tree | 8816f2fc9f59db7206eecb59b8fda3ad08e77cf1 /git-resolve-script | |
| parent | [PATCH] three --merge-order bug fixes (diff) | |
| download | tgif-5b1ea09de1eb2ae190169ca77e16a79de0e1ede7.tar.xz | |
Make default merge messages denser.
In particular, make them readable on one line since that's what all the
tools like git-shortlog and gitk end up showing.
Diffstat (limited to 'git-resolve-script')
| -rw-r--r-- | git-resolve-script | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-resolve-script b/git-resolve-script index cd6e25a8a2..da79a973ea 100644 --- a/git-resolve-script +++ b/git-resolve-script @@ -43,7 +43,7 @@ if [ "$common" == "$head" ]; then fi echo "Trying to merge $merge into $head" git-read-tree -u -m $common $head $merge || exit 1 -merge_msg="Merge of $merge_repo" +merge_msg="Merge $merge_repo" result_tree=$(git-write-tree 2> /dev/null) if [ $? -ne 0 ]; then echo "Simple merge failed, trying Automatic merge" @@ -52,7 +52,6 @@ if [ $? -ne 0 ]; then echo "Automatic merge failed, fix up by hand" exit 1 fi - merge_msg="Automatic merge of $merge_repo" result_tree=$(git-write-tree) || exit 1 fi result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge) |