# [PATCH 6/6] Mention to the user that they can reorder commits 4 messages from 2009-02-19 to 2009-02-19. Participants: John Tapsell, Pieter de Bie, SZEDER Gábor. Thread: https://gitlist.dev/t/17894 ## John Tapsell, 2009-02-19 07:37 Subject: [PATCH 6/6] Mention to the user that they can reorder commits Message-ID: <200902190737.01121.johnflux@gmail.com> URL: https://gitlist.dev/e/200902190737.01121.johnflux%40gmail.com ``` Signed-off-by: John Tapsell --- 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 ``` ## Pieter de Bie, 2009-02-19 09:13 Subject: Re: [PATCH 6/6] Mention to the user that they can reorder commits Message-ID: <53F7BA4C-6F63-4993-A959-E67E4FB4F456@frim.nl> URL: https://gitlist.dev/e/53F7BA4C-6F63-4993-A959-E67E4FB4F456%40frim.nl In-Reply-To: <200902190737.01121.johnflux@gmail.com> ``` On 19 feb 2009, at 07:37, John Tapsell wrote: > Signed-off-by: John Tapsell > --- Yes, this has been raised many times in #git now, so it makes sense to include it. - Pieter ``` ## SZEDER Gábor, 2009-02-19 10:16 Subject: Re: [PATCH 6/6] Mention to the user that they can reorder commits Message-ID: <20090219101638.GA20707@neumann> URL: https://gitlist.dev/e/20090219101638.GA20707%40neumann In-Reply-To: <53F7BA4C-6F63-4993-A959-E67E4FB4F456@frim.nl> ``` 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 >> --- > > 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. 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 ``` ## John Tapsell, 2009-02-19 10:24 Subject: Re: [PATCH 6/6] Mention to the user that they can reorder commits Message-ID: <43d8ce650902190224g71c821f1p5b9f07d61f417aab@mail.gmail.com> URL: https://gitlist.dev/e/43d8ce650902190224g71c821f1p5b9f07d61f417aab%40mail.gmail.com In-Reply-To: <20090219101638.GA20707@neumann> ``` 2009/2/19 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 >>> --- >> >> 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. > > > > 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 > > ```