{"thread":{"id":"17683","subject":"[PATCH v2] git-rebase-interactive: you can also add new commits to the \"work list\"","startedAt":"2009-02-09T22:44:54Z","lastAt":"2009-02-09T22:51:13Z","messageCount":2,"participants":["Kjetil Barvik","Santi Béjar"],"isPatch":true,"patchVersion":2,"patchTotal":null},"messages":[{"id":"103922","messageId":"1234219494-20513-1-git-send-email-barvik@broadpark.no","threadId":"17683","inReplyTo":null,"subject":"[PATCH v2] git-rebase-interactive: you can also add new commits to the \"work list\"","fromName":"Kjetil Barvik","fromEmail":"barvik@broadpark.no","sentAt":"2009-02-09T22:44:54Z","receivedAt":"2009-02-09T22:44:54Z","isPatch":true,"sender":{"key":"barvik@broadpark.no","avatar":null},"body":"Add some lines to document that you can also use 'git rebase\n--interactive' to add new commits to the rebased patch-series.  This\nis sort of running multiple 'git cherry-pick' commands in one go.\n\nSigned-off-by: Kjetil Barvik <barvik@broadpark.no>\n---\n Documentation/git-rebase.txt |    8 ++++++--\n 1 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 3d6d429..11eff32 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -318,8 +318,9 @@ Start it with the last commit you want to retain as-is:\n \n An editor will be fired up with all the commits in your current branch\n (ignoring merge commits), which come after the given commit.  You can\n-reorder the commits in this list to your heart's content, and you can\n-remove them.  The list looks more or less like this:\n+reorder the commits in this list to your heart's content, you can\n+remove them, and you can and new commits.  The list looks more or less\n+like this:\n \n -------------------------------------------\n pick deadbee The oneline of this commit\n@@ -331,6 +332,9 @@ The oneline descriptions are purely for your pleasure; 'git-rebase' will\n not look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this\n example), so do not delete or edit the names.\n \n+You can also introduce a new commit into the list, by finding the SHA1\n+ref of that new commit, and place a command in front of it.\n+\n By replacing the command \"pick\" with the command \"edit\", you can tell\n 'git-rebase' to stop after applying that commit, so that you can edit\n the files and/or the commit message, amend the commit, and continue\n-- \n1.6.1.349.g99fa5\n"},{"id":"103924","messageId":"adf1fd3d0902091451j27b06356oe626e909a691a0cd@mail.gmail.com","threadId":"17683","inReplyTo":"1234219494-20513-1-git-send-email-barvik@broadpark.no","subject":"Re: [PATCH v2] git-rebase-interactive: you can also add new commits to the \"work list\"","fromName":"Santi Béjar","fromEmail":"santi@agolina.net","sentAt":"2009-02-09T22:51:13Z","receivedAt":"2009-02-09T22:51:13Z","isPatch":true,"sender":{"key":"santi@agolina.net","avatar":null},"body":"2009/2/9 Kjetil Barvik <barvik@broadpark.no>:\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index 3d6d429..11eff32 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -318,8 +318,9 @@ Start it with the last commit you want to retain as-is:\n>\n>  An editor will be fired up with all the commits in your current branch\n>  (ignoring merge commits), which come after the given commit.  You can\n> -reorder the commits in this list to your heart's content, and you can\n> -remove them.  The list looks more or less like this:\n> +reorder the commits in this list to your heart's content, you can\n> +remove them, and you can and new commits.  The list looks more or less\n> +like this:\n\ns/you can and/you can add/\n\nSanti\n"}]}