guberm / tortoisegit

Automatically exported from code.google.com/p/tortoisegit
0 stars 0 forks source link

Review diff during rebase #2009

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago
Enhancement:

1. do Rebase in Log dialog
2. want to review diff before edit message

What is the expected output? 
no Revision Files sheet to let me review diff.

What do you see instead?
I want Revision Files to review the diff. 
See attached file.

Original issue reported on code.google.com by yuelinho...@gmail.com on 20 Nov 2013 at 12:34

Attachments:

GoogleCodeExporter commented 9 years ago

Original comment by ch3co...@gmail.com on 20 Nov 2013 at 12:59

GoogleCodeExporter commented 9 years ago
You can see these files when you open the commit dialog and check the 'Amend 
Last Commit' box.
This way you can also edit the content of the files during a rebase session, 
instead of just editing the commit text.

It would be nice to be able to launch the commit dialog from this rebase 
window, and automatically enable 'Amend Last Commit'. Also don't warn about the 
detached HEAD in this case :)

Original comment by jopi...@gmail.com on 20 Nov 2013 at 1:01

GoogleCodeExporter commented 9 years ago

Original comment by sstrickr...@googlemail.com on 20 Nov 2013 at 1:29

GoogleCodeExporter commented 9 years ago
[deleted comment]
GoogleCodeExporter commented 9 years ago
Hi jopie64:

Agree.

Wish steps if possible:

1. Change REBASE operation of some commit to Edit.

2. When TGit picks the editable commit during rebase, popup Commit dialog with 
check and lock "Amend" checkbox automatically. 
   ( I think Amend checkbox can't be un-checked. )

3. review diff, edit message, modify file, set commit date, set author... in 
Commit dialog.
   ( Maybe hide/disable "Message only" and "New branch" checkbox ??? )

4. push OK to continue in Commit dialog.

Original comment by yuelinho...@gmail.com on 20 Nov 2013 at 2:59

GoogleCodeExporter commented 9 years ago
One must also be able to uncheck the amend checkbox. This way you are able to 
break one commit into several others. (During first amend you uncheck some 
files for commit, which then become dirty. After that you should be able to 
commit those dirty files in a separate commit and not amend it to the previous 
one)
When the rebase continue button is pressed, it should check whether the working 
dir is clean again, or the continued rebase may fail after the edit (which 
actually happened to me once)

Original comment by jopi...@gmail.com on 20 Nov 2013 at 6:34

GoogleCodeExporter commented 9 years ago
Maybe solve the issue #1872 together?

Original comment by yuelinho...@gmail.com on 7 Dec 2013 at 2:36

GoogleCodeExporter commented 9 years ago
@jopie64 Please see issue #2339. However, our current approach does not yet 
allow commits to be splitted.

I'll leave this issue open as a separate issue for now.

Original comment by sstrickr...@googlemail.com on 8 Nov 2014 at 4:39