Re: [PATCH] rebase -i: introduce the 'test' command
- From
Duy Nguyen <pclouds@gmail.com>
- Date
- Dec 3, 2018, 17:53 UTC
- Message-ID
- <20181203175322.GA3892@duynguyen.home>
- In-Reply-To
- <20181201200209.GC29120@sigill.intra.peff.net>
On Sat, Dec 01, 2018 at 03:02:09PM -0500, Jeff King wrote:
> I sometimes add "x false" to the top of the todo list to stop and create > new commits before the first one.
And here I've been doing the same by "edit" the first commit, add a new commit then reorder them in the second interactive rebase :P
This made me look at git-rebase.txt to really learn about interactive rebase. I think the interactive rebase section could use some improvements. Its style looks.. umm.. more story telling than a reference. Perhaps something like this to at least highlight the commands.
-- 8< --
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 80793bad8d..c569b3370b 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -637,22 +637,22 @@ The oneline descriptions are purely for your pleasure; 'git rebase' will not look at them but at the commit names ("deadbee" and "fa1afe1" in this example), so do not delete or edit the names. -By replacing the command "pick" with the command "edit", you can tell +By replacing the command `pick` with the command `edit`, you can tell 'git rebase' to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing. To interrupt the rebase (just like an "edit" command would do, but without -cherry-picking any commit first), use the "break" command. +cherry-picking any commit first), use the `break` command. If you just want to edit the commit message for a commit, replace the -command "pick" with the command "reword". +command "pick" with the command `reword`. -To drop a commit, replace the command "pick" with "drop", or just +To drop a commit, replace the command "pick" with `drop`, or just delete the matching line. If you want to fold two or more commits into one, replace the command -"pick" for the second and subsequent commits with "squash" or "fixup". +"pick" for the second and subsequent commits with `squash` or `fixup`. If the commits had different authors, the folded commit will be attributed to the author of the first commit. The suggested commit message for the folded commit is the concatenation of the commit @@ -693,7 +693,7 @@ $ git rebase -i -p --onto Q O Reordering and editing commits usually creates untested intermediate steps. You may want to check that your history editing did not break anything by running a test, or at least recompiling at intermediate -points in history by using the "exec" command (shortcut "x"). You may +points in history by using the `exec` command (shortcut `x`). You may do so by creating a todo list like this one: ------------------------------------------- -- 8< -- -- Duy