[PATCH v1 3/3] doc: rebase: clarify fixup! fixup! constraint
- From
Philip Oakley <philipoakley@iee.org>
- Date
- Aug 14, 2016, 21:46 UTC
- Message-ID
- <20160814214630.1312-4-philipoakley@iee.org>
- In-Reply-To
- <20160814214630.1312-1-philipoakley@iee.org>
22c5b13 (rebase -i: handle fixup! fixup! in --autosquash, 2013-06-27)
Signed-off-by: Philip Oakley <philipoakley@iee.org> --- v1 the historical discussion about this is here https://public-inbox.org/git/20130611180530.GA18488%40oinkpad.pimlott.net/
I certainly misunderstood what this meant. It sounded like only one fixup! was allowed per commit (i.e. one mistake) - fixing two mistakes wouldn't be allowed. Hindsight is a wonderful thing.
Also, does 'earliest commit requiring fixup/squash' fully convey that its the one to fix. --- Documentation/git-rebase.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 66b789a..91eb107 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -425,9 +425,9 @@ without an explicit `--interactive`. automatically modify the todo list of rebase -i 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`). Ignores subsequent - "fixup! " or "squash! " after the first, in case you referred to an - earlier fixup/squash with `git commit --fixup/--squash`. + commit from `pick` to `squash` (or `fixup`). Commits with repeated + "fixup! " or "squash! " in the subject line are considered to refer + to the earliest commit requiring fixup/squash. + This option is only valid when the '--interactive' option is used. +
-- 2.9.0.windows.1