From 42cfcd20a7e264eb7fc3c42c892ff498cde0542b Mon Sep 17 00:00:00 2001 From: "Horst H. von Brand" Date: Thu, 21 Jan 2010 17:34:25 -0300 Subject: [PATCH] git-rebase.txt: Fix spelling Signed-off-by: Horst H. von Brand Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 89a957ef77..823f2a4638 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -312,7 +312,7 @@ which makes little sense. When the commit log message begins with "squash! ..." (or "fixup! ..."), and there is a commit whose title begins with 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 from `pick` to `squash` (or `fixup`). +