summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-11 06:00:29 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-11 06:00:29 (GMT)
commita057f806674f691f1640d33df14de8de8a3d4c87 (patch)
tree23ca435fd511865b4b7d1120ad006523e207bd25 /git-pull.sh
parent9861718b305a672f3d17936ea6a6cbd9d9a70059 (diff)
downloadgit-a057f806674f691f1640d33df14de8de8a3d4c87.zip
git-a057f806674f691f1640d33df14de8de8a3d4c87.tar.gz
git-a057f806674f691f1640d33df14de8de8a3d4c87.tar.bz2
git-pull: we say commit X, not X commit.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh
index f380437..ed04e7d 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -58,7 +58,7 @@ then
echo >&2 "Warning: fetch updated the current branch head."
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-read-tree -u -m "$orig_head" "$curr_head" ||
die 'Cannot fast-forward your working tree.