{"thread":{"id":"17679","subject":"[PATCH] git-rebase-interactive: you can also add new commits to the \"work list\"","startedAt":"2009-02-09T21:25:01Z","lastAt":"2009-02-09T22:26:23Z","messageCount":4,"participants":["Kjetil Barvik","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"103902","messageId":"1234214701-20245-1-git-send-email-barvik@broadpark.no","threadId":"17679","inReplyTo":null,"subject":"[PATCH] git-rebase-interactive: you can also add new commits to the \"work list\"","fromName":"Kjetil Barvik","fromEmail":"barvik@broadpark.no","sentAt":"2009-02-09T21:25:01Z","receivedAt":"2009-02-09T21:25:01Z","isPatch":true,"sender":{"key":"barvik@broadpark.no","avatar":null},"body":"Add 2 small 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\n  If this is a good idea, soneone should correct my poor english.\n\n  -- kjetil\n\n\n git-rebase--interactive.sh |    3 +++\n 1 files changed, 3 insertions(+), 0 deletions(-)\n\ndiff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh\nindex 3dc659d..aa2e53c 100755\n--- a/git-rebase--interactive.sh\n+++ b/git-rebase--interactive.sh\n@@ -734,6 +734,9 @@ first and then run 'git rebase --continue' again.\"\n # If you remove a line here THAT COMMIT WILL BE LOST.\n # However, if you remove everything, the rebase will be aborted.\n #\n+# If you add a new line with a command followed by the SHA1 ref of the\n+# patch, then that patch will be added to the list.\n+#\n EOF\n \n \t\thas_action \"$TODO\" ||\n-- \n1.6.1.349.g99fa5\n"},{"id":"103904","messageId":"alpine.DEB.1.00.0902092228470.10279@pacific.mpi-cbg.de","threadId":"17679","inReplyTo":"1234214701-20245-1-git-send-email-barvik@broadpark.no","subject":"Re: [PATCH] git-rebase-interactive: you can also add new commits to the \"work list\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-02-09T21:31:56Z","receivedAt":"2009-02-09T21:31:56Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 9 Feb 2009, Kjetil Barvik wrote:\n\n> Add 2 small lines to document that you can also use 'git rebase\n> --interactive' to add new commits to the rebased patch-series.  This\n> is sort of running multiple 'git cherry-pick' commands in one go.\n\nIf we start along those lines, we also have to add documentation how to\n\n- split commit,\n\n- change authorship of commits,\n\n- deal with commits where --cherry-pick did not detect that they were \n  applied already,\n\n- deal with merge commits, and\n\n- possibly a lot more.\n\nI do not think that this is a good way to spend valuable screen estate; I \nthink that is what the man page should cover.\n\nI only made an exception for the deletion of lines, as people were \nactively burnt.  Yes, they should have read the man page.  But the \nconsequences of not doing so were bad.\n\nCiao,\nDscho\n"},{"id":"103908","messageId":"86eiy7th3w.fsf@broadpark.no","threadId":"17679","inReplyTo":"alpine.DEB.1.00.0902092228470.10279@pacific.mpi-cbg.de","subject":"Re: [PATCH] git-rebase-interactive: you can also add new commits to the \"work list\"","fromName":"Kjetil Barvik","fromEmail":"barvik@broadpark.no","sentAt":"2009-02-09T21:50:27Z","receivedAt":"2009-02-09T21:50:27Z","isPatch":true,"sender":{"key":"barvik@broadpark.no","avatar":null},"body":"Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n\n<snipp>\n> I do not think that this is a good way to spend valuable screen estate; I \n> think that is what the man page should cover.\n\n  I agree!  Ok, then the correct thing todo whould be to add some lines\n  to the git-rebase.txt file in this case.\n\n  -- kjetil\n"},{"id":"103916","messageId":"alpine.DEB.1.00.0902092326120.10279@pacific.mpi-cbg.de","threadId":"17679","inReplyTo":"86eiy7th3w.fsf@broadpark.no","subject":"Re: [PATCH] git-rebase-interactive: you can also add new commits to the \"work list\"","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2009-02-09T22:26:23Z","receivedAt":"2009-02-09T22:26:23Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 9 Feb 2009, Kjetil Barvik wrote:\n\n> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:\n> \n> <snipp>\n> > I do not think that this is a good way to spend valuable screen estate; I \n> > think that is what the man page should cover.\n> \n>   I agree!  Ok, then the correct thing todo whould be to add some lines\n>   to the git-rebase.txt file in this case.\n\nThat would be awesome!\n\nCiao,\nDscho\n"}]}