2 ms·

I've been using tig for things like this. Are they related somehow? Tig is amazing :)

• keyle 5y ago
  Also recommend lazygit. I use it everyday and it's pretty awesome.
  • berkes 5y ago
    For the lazy: it is on github. https://github.com/jesseduffield/lazygit#readme https://github.com/jesseduffield/lazygit#readme
• rgoulter 5y ago
  Magit's more feature-rich and has better discoverability than tig, from what I can tell. e.g. with tig, you invoke "!git commit" by pressing C from the status page. With magit, from the status page, commit is performed by pressing cc. But, if you press only 'c', a context menu is brought up which shows the flags which can be set, and commands which can be run. e.g. 'cc' is 'commit', but 'ca' is 'amend'. e.g. An example of a flag might be "--force-with-lease". So, press 'P' opens the push context menu, '-f' enables the "--force-with-lease" flag, 'p' pushes to the remote. (Or just 'P-fp' quickly works, too). tig looks like 80% of the benefits (much nicer to use than git) for 20% of the effort (not having to learn Emacs).
• aequitas 5y ago
  I love Tig for quickly visualising and browsing the Git tree. Wish it would support interactive rebase in a more elaborate way so you could maybe reorder or amend commits from the tree view itself, instead of breaking out into Git commands.
  • lillecarl 5y ago
    git-imerge rebase is what you want, git-imerge is one of the coolest tools I've used.