Reduce chance of committing old submodule revision on cherry-pick / rebase conflicts
By @ch3cooli on January 21, 2013 05:46 (imported from Google Code)
Unlike merge, which may have conflicts for one time only,
there may be multiple times of conflicts during cherry-picking / rebasing.
Currently, rebase dialog automatically stages any files and submodules.
There is no checkbox to uncheck unwanted changes.
Therefore, we need to run submodule update multiple times during cherry-picking / rebasing.
Prompt to update submodule is not a good solution, because if using command line, the extra steps are not necessary.
If forget to run submodule update, it stages the old revision which is wrong!
Suggestion: show checkboxes in GitStatusCtrl, just like Commit Dialog.
What version of TortoiseGit and msysgit are you using? On
what operating system?
TortoiseGit 1.7.15
msysgit 1.8.0