Skip to content
Snippets Groups Projects
Commit a057f806 authored by Junio C Hamano's avatar Junio C Hamano
Browse files

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


Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
parent 9861718b
Branches
Tags
No related merge requests found
...@@ -58,7 +58,7 @@ then ...@@ -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.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment