Gitbox 1.5: native undo for git operations
gitboxapp.com
gitboxapp.com
- It doesn't have a good representation of the branch tree (like GitX). It's a must for anyone who deals with multiple branches.
- I can't stage parts of a file. GitX makes that really easy.
- I can't see the contents of a stash (again, easy in GitX). But GitBox makes it easy to see my list of stashes, which GitX doesn't.
- GitX also wins in that I can see the changes made in a commit by simply clicking the file name. GitX opens a third party app.
- It's not clear to me why there is a big vertical space on the left dedicated to listing my repositories, while my branches are hidden behind a small drop-down box. I'm more likely to deal with multiple branches than multiple repositories at any one time so it makes more sense to keep my branches visible and hide my other repositories behind a drop-down menu.
On the other hand, I really like that GitBox refreshes it's state automatically. This is one of the issues with GitX that I need to hit Cmd-R every time I switch to it. Overall, great start.
I also note that the apparent keyboard shortcut for "Show Difference" is just "D". Not command-D. Just "D". Not only is this highly unusual (no keyboard modifier like Cmd/Ctrl/Shift/etc.) but it also doesn't work.
Yes. It's the major missing feature for git. Novices spend more time figuring out how to undo their mistakes than anything else.
If the undo has side effects (i.e. "if someone cloned this branch since you did the action you want to undo, stuff will break"), the tool should display that warning and ask to continue.
Undo on local working branches only would already be a big help.
I ended up going back to GitX when I found there's a more recently updated fork maintained by German Laullon: http://gitx.laullon.com/ It has a few bugs, but I find it's much more usable than the commercial alternatives.
As for me though, I still prefer the command line :)
That said, I paid for this app and have used it to manage merge conflicts that would have otherwise driven me nuts w/o a GUI
Good point. I agree.
That's interesting that you use it exclusively for merge conflicts. I will give it a look.
I've used GitX in the past but mostly as a crutch when the terminal client confused me (or when I needed pretty pictures.); It's X11 foundation always turned me off on the Mac. However, the latest GitX looks really good and might even turn me from my terminal ways. :)