diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 08:31:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-25 06:50:28 (GMT) |
| commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
| tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /git-merge-octopus.sh | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.zip git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.gz git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.bz2 | |
Use 'fast-forward' all over the place
It's a compound word.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-octopus.sh')
| -rwxr-xr-x | git-merge-octopus.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh index 1dadbb4..825c52c 100755 --- a/git-merge-octopus.sh +++ b/git-merge-octopus.sh @@ -81,7 +81,7 @@ do # tree as the intermediate result of the merge. # We still need to count this as part of the parent set. - echo "Fast forwarding to: $SHA1" + echo "Fast-forwarding to: $SHA1" git read-tree -u -m $head $SHA1 || exit MRC=$SHA1 MRT=$(git write-tree) continue |