development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-pull: we say commit X, not X commit.

Browse source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-10-10 23:00:29 -07:00
parent 9861718b30
commit a057f80667
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-pull.sh
View file

@ -58,7 +58,7 @@ then
echo >&2 "Warning: fetch updated the current branch head." echo >&2 "Warning: fetch updated the current branch head."
echo >&2 "Warning: fast forwarding your working tree from" echo >&2 "Warning: fast forwarding your working tree from"
echo >&2 "Warning: $orig_head commit." echo >&2 "Warning: commit $orig_head."
git-update-index --refresh 2>/dev/null git-update-index --refresh 2>/dev/null
git-read-tree -u -m "$orig_head" "$curr_head" || git-read-tree -u -m "$orig_head" "$curr_head" ||
die 'Cannot fast-forward your working tree. die 'Cannot fast-forward your working tree.