On Wed, 25 May 2016, Mark Adams wrote: > > > > > > > > I have no idea how Mac users use git effectively without a working > > 'gitk' [to verify commit diffs] or 'git gui' [to selectively commit > > some changes] or 'kdiff3' which I use via 'git mergetool' [for 3-way > > merges].. > > > > Yes, I have a lot of things that I would like to be able to do, like see a > list of diffs between a branch and main.
I use gitk for this gitk master..origin/mark/snes-ex56c Or git log master..origin/mark/snes-ex56c There must be some option to 'git log' or 'git diff' to show equivalent of what 'gitk' shows - but I don't know what that is.. > > I do seem to have kdiff3. If thats the case - when you have a merge conflict during 'merge' or 'rebase' - then you should be able to do 'git mergetool' and easily resolve the conflict using kdiff3 Satish
