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>
This commit is contained in:

committed by
Junio C Hamano

parent
78d553b7d7
commit
a75d7b5409
@ -315,8 +315,8 @@ generate_update_branch_email()
|
||||
# "remotes/" will be ignored as well.
|
||||
|
||||
# List all of the revisions that were removed by this update, in a
|
||||
# fast forward update, this list will be empty, because rev-list O
|
||||
# ^N is empty. For a non fast forward, O ^N is the list of removed
|
||||
# fast-forward update, this list will be empty, because rev-list O
|
||||
# ^N is empty. For a non-fast-forward, O ^N is the list of removed
|
||||
# revisions
|
||||
fast_forward=""
|
||||
rev=""
|
||||
@ -411,7 +411,7 @@ generate_update_branch_email()
|
||||
# revision because the base is effectively a random revision at this
|
||||
# point - the user will be interested in what this revision changed
|
||||
# - including the undoing of previous revisions in the case of
|
||||
# non-fast forward updates.
|
||||
# non-fast-forward updates.
|
||||
echo ""
|
||||
echo "Summary of changes:"
|
||||
git diff-tree --stat --summary --find-copies-harder $oldrev..$newrev
|
||||
|
Reference in New Issue
Block a user