[PATCH 6/6] Mention to the user that they can reorder commits

[PATCH 6/6] Mention to the user that they can reorder commits

[John Tapsell]

Signed-off-by: John Tapsell <johnflux@gmail.com>
---
 git-rebase--interactive.sh |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 3dc659d..2f58922 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -733,6 +733,7 @@ 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.
+# You can reorder the lines to reorder the commits.
 #
 EOF
 
-- 
1.6.2.rc1.3.g7d31b.dirty

Re: [PATCH 6/6] Mention to the user that they can reorder commits

[Pieter de Bie]

On 19 feb 2009, at 07:37, John Tapsell wrote:

> Signed-off-by: John Tapsell <johnflux@gmail.com>
> ---

Yes, this has been raised many times in #git now, so it makes
sense to include it.

- Pieter

Re: [PATCH 6/6] Mention to the user that they can reorder commits

[SZEDER Gábor]

On Thu, Feb 19, 2009 at 09:13:49AM +0000, Pieter de Bie wrote:
>
> On 19 feb 2009, at 07:37, John Tapsell wrote:
>
>> Signed-off-by: John Tapsell <johnflux@gmail.com>
>> ---
>
> Yes, this has been raised many times in #git now, so it makes
> sense to include it.

A similar idea came around last week, and in turn Dscho explained why
such a change is not a good idea.  I think he is fully right here.


<alpine.DEB.1.00.0902092228470.10279@pacific.mpi-cbg.de>
http://article.gmane.org/gmane.comp.version-control.git/109136

  On Mon, Feb 09, 2009 at 10:31:56PM +0100, Johannes Schindelin wrote:
  > 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.


Regards,
Gábor

Re: [PATCH 6/6] Mention to the user that they can reorder commits

[John Tapsell]

2009/2/19 SZEDER Gábor <szeder@ira.uka.de>:
> On Thu, Feb 19, 2009 at 09:13:49AM +0000, Pieter de Bie wrote:
>>
>> On 19 feb 2009, at 07:37, John Tapsell wrote:
>>
>>> Signed-off-by: John Tapsell <johnflux@gmail.com>
>>> ---
>>
>> Yes, this has been raised many times in #git now, so it makes
>> sense to include it.
>
> A similar idea came around last week, and in turn Dscho explained why
> such a change is not a good idea.  I think he is fully right here.
>
>
> <alpine.DEB.1.00.0902092228470.10279@pacific.mpi-cbg.de>
> http://article.gmane.org/gmane.comp.version-control.git/109136
>
>  On Mon, Feb 09, 2009 at 10:31:56PM +0100, Johannes Schindelin wrote:
>  > If we start along those lines, we also have to add documentation how
>  > to
>  >
>  > - split commit,

That can be done from the "git rebase -i"  screen?  I'm guessing you
mean choosing 'edit' and doing it from there.

Same for all the other comments.  How many of these can actually be
done from the "git rebase -i" screen?

>  > - 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.
>
>
> Regards,
> Gábor
>
>