New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add an interactive rebase GUI with drag + drop editing #1
Comments
I second that. |
git 1.7.8 (not yet released) would allow us to do, for example:
...and use a custom GUI as the rebase editor. We could do all the drag/drop editing in there. Older versions of git could accomplish the same thing by doing:
So that could be one way to do it. Newer git versions understand "fixup" and "exec" so we'll need to do some version checks so that we can suppress that option for older versions. I'm not really sure how to best handle "reword", "edit", and "squash". Hijacking "GIT_EDITOR" means git would execute Do we need to make sure that It wouldn't be a bad idea to have a simple skeletor version for drag and drop re-ordering. That subset of features is safe and won't bring in the GIT_EDITOR dragons. We could guard the advanced features behind a git-1.7.8 version check and a runtime check to ensure that GIT_EDITOR is not defined to the rebase script. We'll need to read older versions of In any case, I think writing a custom editor over the rebase instruction sheet is probably the way to go. What do you think @ugtar? |
mmmm... I think this issue is git cola's white whale =) |
git-xbase is a standalone rebase editor that can be used from the command-line, e.g.: GIT_SEQUENCE_EDITOR=$PWD/share/git-cola/bin/git-xbase git rebase -i master Subsequent commits will integrate this script into the git-cola UI. Related-to: git-cola#1 Signed-off-by: David Aguilar <davvid@gmail.com>
Modern Git understands It took a while, but it's not too shabby. It might be worth making it so that we show the message + diff when clicking a commit as a future enhancement. |
woohoo! On Sun, Oct 6, 2013 at 2:33 PM, David Aguilar notifications@github.comwrote:
Uri Please consider the environment before printing this message. |
Add a diff viewer (the same as the one used in the DAG viewer) to display commits as they are selected in the list. Allow launching an external diff via "git difftool". Move the help message into a menu action. Related-to: git-cola#1 Signed-off-by: David Aguilar <davvid@gmail.com>
A gui for 'git rebase -i' would royally rock.
We'd need to check on the status on git-sequencer. Ideally we'd just be providing an interactive front end to the 'rebase -i' text file, though integrating more tightly might mean implementing parts of rebase in python.
The text was updated successfully, but these errors were encountered: