development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 19:49:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make merge comment git-pull makes for an octopus a bit prettier.

Browse source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-09-13 23:49:55 -07:00
parent 2ba6c47be1
commit c80522e30f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
git-pull.sh
View file

@ -24,9 +24,11 @@ then
die "You need to first update your working tree."
fi
merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD | tr '\012' ' ')
merge_name=$(sed -e 's/^[0-9a-f]* //' "$GIT_DIR"/FETCH_HEAD |
tr '\012' ' ')
merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD)
merge_name=$(
perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
"$GIT_DIR"/FETCH_HEAD
)
case "$merge_head" in
'')