Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Revert breakage introduced by c80522e30fdc190f8c8c7fc983bbe040a1b03e93.
author
Junio C Hamano
<junkio@cox.net>
Fri, 16 Sep 2005 00:38:26 +0000
(17:38 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 16 Sep 2005 00:38:26 +0000
(17:38 -0700)
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
316eee8
)
diff --git
a/git-pull.sh
b/git-pull.sh
index dd36c615b60665d128e9dc07c3988d9f2bac3878..8cf39e7f6495925c9f9824ebea518810554ba12b 100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-24,7
+24,7
@@
then
die "You need to first update your working tree."
fi
die "You need to first update your working tree."
fi
-merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD)
+merge_head=$(sed -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD
| tr '\012' ' '
)
merge_name=$(
perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
"$GIT_DIR"/FETCH_HEAD
merge_name=$(
perl -e 'print join("; ", map { chomp; s/^[0-9a-f]* //; $_ } <>)' \
"$GIT_DIR"/FETCH_HEAD