diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:41:02 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:41:02 +0100 |
| commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 (patch) | |
| tree | eeb42aefe5555624063221d7ddc28a29f598ce7f /git-pull.sh | |
| parent | Merge branch 'sc/difftool-p4merge' (diff) | |
| parent | Use 'fast-forward' all over the place (diff) | |
| download | git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.xz git-4d8c3258880548510b1d23f0db517adb7dfd2486.zip | |
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-pull.sh b/git-pull.sh index 37f3d93017..bfeb4a0ff6 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -174,7 +174,7 @@ then # First update the working tree to match $curr_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: commit $orig_head." git update-index -q --refresh git read-tree -u -m "$orig_head" "$curr_head" || |