I love smartgit for it's nice side by side diff view. This is especially handy for resolving conflicts and staging commits.
However I like to optional see the unified diff view from gitk or GitHub during reviews.
This has these advantages:
* I can see changes vertical aligned
* I can skim newspaper like through the diff without looking to the left and right column at every change.
* It required less vertical space, no vertical scrolling on small screens.
* Less or no horizontal scrolling for two changes in a big file.
Currently I use gitk on my daily work and open smartgit during merges or whenever the side by side diff is handy.
Since we are now using the Pull Request feature, I like to comment directly in smartgit but using the diff view to have a quick overview to the changes without to much scrolling.
I love smartgit for it's nice side by side diff view. This is especially handy for resolving conflicts and staging commits.
However I like to optional see the unified diff view from gitk or GitHub during reviews.
This has these advantages:
* I can see changes vertical aligned
* I can skim newspaper like through the diff without looking to the left and right column at every change.
* It required less vertical space, no vertical scrolling on small screens.
* Less or no horizontal scrolling for two changes in a big file.
Currently I use gitk on my daily work and open smartgit during merges or whenever the side by side diff is handy.
Since we are now using the Pull Request feature, I like to comment directly in smartgit but using the diff view to have a quick overview to the changes without to much scrolling.