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.

diff --git a/git-pull-script b/git-pull-script
index a4ca97c64566419a0dc02e8e719333d1c9240edc..dbef56c70b7e40c69517c3ede33544d0e9efcc8a 100755 (executable)
--- a/git-pull-script
+++ b/git-pull-script
@@ -6,9 +6,7 @@ merge_name=$(echo "$1" | sed 's:\.git/*$::')
 merge_head=HEAD
 if [ "$2" ]
 then
 merge_head=HEAD
 if [ "$2" ]
 then

-   merge_name="'$2' branch from
-
-       $merge_name"
+   merge_name="'$2' branch of $merge_name"

    merge_head="refs/heads/$2"
 fi
 
    merge_head="refs/heads/$2"
 fi
 

diff --git a/git-resolve-script b/git-resolve-script
index cd6e25a8a2bfca43f4b4b01cfda4378203b2b09c..da79a973eaafa1b8b7e21b719698762896e13569 100644 (file)
--- 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
 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"
 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
                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)
        result_tree=$(git-write-tree) || exit 1
 fi
 result_commit=$(echo "$merge_msg" | git-commit-tree $result_tree -p $head -p $merge)