Finally, when I was first taught Git, I was told that I should never need to comment out code again. I never understood how this was possible until I learned how to use 'git add -p' and 'git rebase -i' in tandem.
+1 for tig. Definitely my favourite git interface. Its status view is also very handy for viewing diffs, and adding/removing files to the index, as well as reverting changes.
Also, it now has mouse support. I know this, cos I added it :)
> will prevent you from getting stuck resolving the same merge conflicts repeatedly, by remembering how you resolved them the last time.
That's on by default these days; if you re-do a merge and git finds the conflict in rerere, it'll automatically use the saved resolution rather than inserting conflict markers.
Agree, tig is awesome and in my opinion the best git GUI (or at least representation). Use the normal commandline tools for commiting/cutting/rebasing/... and tig to see where everything is at!
> git-rerere
will prevent you from getting stuck resolving the same merge conflicts repeatedly, by remembering how you resolved them the last time.
Also, instead of passing any arguments to "git-log", I usually just use "tig", an ncurses display of the commits: https://blogs.atlassian.com/2013/05/git-tig/
Finally, when I was first taught Git, I was told that I should never need to comment out code again. I never understood how this was possible until I learned how to use 'git add -p' and 'git rebase -i' in tandem.