From 5b1ea09de1eb2ae190169ca77e16a79de0e1ede7 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 8 Jun 2005 10:09:41 -0700
Subject: 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.
---
 git-pull-script | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'git-pull-script')

diff --git a/git-pull-script b/git-pull-script
index a4ca97c645..dbef56c70b 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
 
-- 
cgit v1.2.3