diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-23 20:53:38 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-23 20:53:38 -0700 |
| commit | ccbb3d17ace70be9d986368d3df795f5961e9683 (patch) | |
| tree | 4f00d6182f6a42bdd93775c8fabb0d205f24a406 /git-pull.sh | |
| parent | gitweb: use for-each-ref to show the latest activity across branches (diff) | |
| parent | Merge branch 'maint' (diff) | |
| download | git-ccbb3d17ace70be9d986368d3df795f5961e9683.tar.gz git-ccbb3d17ace70be9d986368d3df795f5961e9683.zip | |
Merge branch 'master' into jc/web
* master: (114 commits)
gitweb: Fix setting $/ in parse_commit()
daemon: do not die on older clients.
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
git-clone: honor --quiet
Documentation for the [remote] config
prune-packed: Fix uninitialized variable.
ignore-errors requires cl
git-send-email: do not pass custom Date: header
Use column indexes in git-cvsserver where necessary.
gitweb: Add '..' (up directory) to tree view if applicable
gitweb: Improve git_print_page_path
pager: default to LESS=FRSX not LESS=FRS
Make prune also run prune-packed
git-vc: better installation instructions
gitweb: Do not esc_html $basedir argument to git_print_tree_entry
gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2)
Fix usagestring for git-branch
git-merge: show usage if run without arguments
add the capability for index-pack to read from a stream
git-clone: define die() and use it.
...
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 f380437997..ed04e7d8d8 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. |