aboutsummaryrefslogtreecommitdiff
path: root/git-pull-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 10:09:41 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 10:09:41 -0700
commit5b1ea09de1eb2ae190169ca77e16a79de0e1ede7 (patch)
tree8816f2fc9f59db7206eecb59b8fda3ad08e77cf1 /git-pull-script
parent4e7346735aaf0e0d15f0b18023ac21d983b9fd83 (diff)
downloadgit-5b1ea09de1eb2ae190169ca77e16a79de0e1ede7.tar.gz
git-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-pull-script')
-rwxr-xr-xgit-pull-script4
1 files changed, 1 insertions, 3 deletions
diff --git a/git-pull-script b/git-pull-script
index a4ca97c64..dbef56c70 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