mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 'fast-forward' all over the place

Browse Source 
It's a compound word.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras
2009-10-24 11:31:32 +03:00
committed by Junio C Hamano
parent 78d553b7d7
commit a75d7b5409
35 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-pull.sh
View File

@ -171,7 +171,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" ||