Merge branch 'maint'

diff --git a/git-pull.sh b/git-pull.sh
index f380437997f053d15a177a941f3b8a1543c56a18..ed04e7d8d8753cc2cdc7d2737228cb58934534f4 100755 (executable)
--- 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.