diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 11:31:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-24 23:50:28 -0700 |
| commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
| tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /git-rebase--interactive.sh | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.gz git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.xz | |
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-rebase--interactive.sh')
| -rwxr-xr-x | git-rebase--interactive.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 23ded4832..c8987887f 100755 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -168,7 +168,7 @@ pick_one () { output git reset --hard $sha1 test "a$1" = a-n && output git reset --soft $current_sha1 sha1=$(git rev-parse --short $sha1) - output warn Fast forward to $sha1 + output warn Fast-forward to $sha1 else output git cherry-pick "$@" fi @@ -248,9 +248,9 @@ pick_one_preserving_merges () { done case $fast_forward in t) - output warn "Fast forward to $sha1" + output warn "Fast-forward to $sha1" output git reset --hard $sha1 || - die "Cannot fast forward to $sha1" + die "Cannot fast-forward to $sha1" ;; f) first_parent=$(expr "$new_parents" : ' \([^ ]*\)') |