Add some lines to document that you can also use 'git rebase --interactive' to add new commits to the rebased patch-series. This is sort of running multiple 'git cherry-pick' commands in one go.
Signed-off-by: Kjetil Barvik <barvik@broadpark.no> --- Documentation/git-rebase.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
Show changes to Documentation/git-rebase.txt +6 −2
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index 3d6d429..52c0778 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -318,8 +318,9 @@ Start it with the last commit you want to retain as-is: An editor will be fired up with all the commits in your current branch (ignoring merge commits), which come after the given commit. You can -reorder the commits in this list to your heart's content, and you can -remove them. The list looks more or less like this: +reorder the commits in this list to your heart's content, you can +remove them, and you can also add new commits. The list looks more or +less like this: ------------------------------------------- pick deadbee The oneline of this commit @@ -331,6 +332,9 @@ 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. +You can also introduce a new commit into the list, by finding the SHA1 +ref of that new commit, and place a command in front of it. + 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
-- 1.6.1.349.g99fa5