summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 17:09:41 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 17:09:41 (GMT)
commit5b1ea09de1eb2ae190169ca77e16a79de0e1ede7 (patch)
tree8816f2fc9f59db7206eecb59b8fda3ad08e77cf1
parent4e7346735aaf0e0d15f0b18023ac21d983b9fd83 (diff)
downloadgit-5b1ea09de1eb2ae190169ca77e16a79de0e1ede7.zip
git-5b1ea09de1eb2ae190169ca77e16a79de0e1ede7.tar.gz
git-5b1ea09de1eb2ae190169ca77e16a79de0e1ede7.tar.bz2
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.
-rwxr-xr-xgit-pull-script4
-rw-r--r--git-resolve-script3
2 files changed, 2 insertions, 5 deletions
diff --git a/git-pull-script b/git-pull-script
index a4ca97c..dbef56c 100755
--- 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_name="'$2' branch from
-
- $merge_name"
+ merge_name="'$2' branch of $merge_name"
merge_head="refs/heads/$2"
fi
diff --git a/git-resolve-script b/git-resolve-script
index cd6e25a..da79a97 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)