threads / patch / 17679

patchgit-rebase-interactive: you can also add new commits to the "work list"

Subject: [PATCH] git-rebase-interactive: you can also add new commits to the "work list"

## tl;dr

4 messages between Feb 9, 2009 and Feb 9, 2009. Diffs are folded; open one to read it.

replies: 3people: 2as markdown or json

Kjetil Barvik· Feb 9, 2009, 21:25 UTC · lore

Add 2 small 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>
---

  If this is a good idea, soneone should correct my poor english.

  -- kjetil

 git-rebase--interactive.sh |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Show changes to git-rebase--interactive.sh +3 −0

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3dc659d..aa2e53c 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -734,6 +734,9 @@ first and then run 'git rebase --continue' again."
 # If you remove a line here THAT COMMIT WILL BE LOST.
 # However, if you remove everything, the rebase will be aborted.
 #
+# If you add a new line with a command followed by the SHA1 ref of the
+# patch, then that patch will be added to the list.
+#
 EOF
 
 		has_action "$TODO" ||

-- 
1.6.1.349.g99fa5

Johannes Schindelin· Feb 9, 2009, 21:31 UTC · re: Kjetil Barvik · lore

Re: [PATCH] git-rebase-interactive: you can also add new commits to the "work list"

Hi,

On Mon, 9 Feb 2009, Kjetil Barvik wrote:

> Add 2 small 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.

If we start along those lines, we also have to add documentation how to

- split commit,

- change authorship of commits,

- deal with commits where --cherry-pick did not detect that they were 
  applied already,

- deal with merge commits, and

- possibly a lot more.

I do not think that this is a good way to spend valuable screen estate; I think that is what the man page should cover.

I only made an exception for the deletion of lines, as people were actively burnt. Yes, they should have read the man page. But the consequences of not doing so were bad.

Ciao, Dscho

Kjetil Barvik· Feb 9, 2009, 21:50 UTC · re: Johannes Schindelin · lore

Re: [PATCH] git-rebase-interactive: you can also add new commits to the "work list"

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

<snipp>

> I do not think that this is a good way to spend valuable screen estate; I 
> think that is what the man page should cover.

  I agree!  Ok, then the correct thing todo whould be to add some lines
  to the git-rebase.txt file in this case.

  -- kjetil

Johannes Schindelin· Feb 9, 2009, 22:26 UTC · re: Kjetil Barvik · lore

Re: [PATCH] git-rebase-interactive: you can also add new commits to the "work list"

Hi,

On Mon, 9 Feb 2009, Kjetil Barvik wrote:

Show 8 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> <snipp>
> > I do not think that this is a good way to spend valuable screen estate; I 
> > think that is what the man page should cover.
> 
>   I agree!  Ok, then the correct thing todo whould be to add some lines
>   to the git-rebase.txt file in this case.

That would be awesome!

Ciao, Dscho