Mention to the user that they can reorder commits
PATCH 6/6 Mention to the user that they can reorder commits
--- git-rebase--interactive.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
git-rebase--interactive.sh +1 -0
@@ -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
Signature · 1 line
1.6.2.rc1.3.g7d31b.dirty
Quoted 2 lines · John Tapsell
Signed-off-by John Tapsell <[email protected]>---
Yes, this has been raised many times in #git now, so it makes sense to include it.
- Pieter
Quoted 8 lines · Pieter de Bie
Quoted 2 lines · John Tapsell
Signed-off-by John Tapsell <[email protected]>---
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.
<[email protected]>
http://article.gmane.org/gmane.comp.version-control.git/109136
Quoted 14 lines · Johannes Schindelin
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.
Quoted 7 lines
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
2009/2/19 SZEDER Gábor <[email protected]>:
Quoted 10 lines · Pieter de Bie
Quoted 8 lines · John Tapsell
Quoted 3 lines
Signed-off-by John Tapsell <[email protected]>---
Yes, this has been raised many times in #git now, so it makes sense to include it.
Quoted 12 lines
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.
<[email protected]>
http://article.gmane.org/gmane.comp.version-control.git/109136Quoted 4 lines · Johannes Schindelin
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?
Quoted 21 lines
Quoted 8 lines
- 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.
Quoted 7 lines
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