diff options
| author | Horst H. von Brand <vonbrand@inf.utfsm.cl> | 2010-01-21 17:34:25 -0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-21 15:02:45 -0800 |
| commit | 42cfcd20a7e264eb7fc3c42c892ff498cde0542b (patch) | |
| tree | 6458139ba019e8cbe46d51c0093a489e09ee7ef0 /Documentation/git-rebase.txt | |
| parent | 5a9f03952927da82ce70822f3d0c5b4b1d37be4f (diff) | |
| download | git-42cfcd20a7e264eb7fc3c42c892ff498cde0542b.tar.gz git-42cfcd20a7e264eb7fc3c42c892ff498cde0542b.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-rebase.txt')
| -rw-r--r-- | Documentation/git-rebase.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 89a957ef7..823f2a463 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`). + |