git-rebase.txt: Fix spelling
Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5a9f039529
commit
42cfcd20a7
@ -312,7 +312,7 @@ which makes little sense.
|
|||||||
When the commit log message begins with "squash! ..." (or
|
When the commit log message begins with "squash! ..." (or
|
||||||
"fixup! ..."), and there is a commit whose title begins with
|
"fixup! ..."), and there is a commit whose title begins with
|
||||||
the same ..., automatically modify the todo list of rebase -i
|
the same ..., automatically modify the todo list of rebase -i
|
||||||
so that the commit marked for quashing come right after the
|
so that the commit marked for squashing comes right after the
|
||||||
commit to be modified, and change the action of the moved
|
commit to be modified, and change the action of the moved
|
||||||
commit from `pick` to `squash` (or `fixup`).
|
commit from `pick` to `squash` (or `fixup`).
|
||||||
+
|
+
|
||||||
|
Loading…
x
Reference in New Issue
Block a user