6 Commits

Author SHA1 Message Date
German Laullon cc10bda032 openFileMerge on "diff with..." 2011-04-22 15:47:02 -07:00
German Laullon 656cb824a3 NSLog => Dlog (Log only on debug build) 2011-04-05 11:39:01 -07:00
Simeon Leifer 395877f005 explicitly disable external diff so we get the results we need even if the user has an external diff configured 2010-11-17 19:50:51 -07:00
Johannes Gilger 95b48779e8 Diff-View: Honor whitespace preference
This honors the preferences for showing differences in whitespacing when
using diff between single revisions/branches.

Signed-off-by: Johannes Gilger <heipei@hackvalue.de>
2010-09-17 23:47:02 -06:00
Nathan Kinsinger c19d2c8058 Add Diff to contextual menus
- added to menus for refs, commits, and files
    - show a message when there are no changes
2010-03-13 22:16:24 -07:00
Pieter de Bie e8131c3898 Add a diff window
This allows you to do something like

	gitx --diff

to display a diff similar to 'git diff', but with GitX prettification.

It accepts all git diff parameters, so you can do something like

	gitx --diff HEAD~10

to show the diff compared to the last 10 commits. Or, you can something like

	git diff | gitx

to pipe anything that produces a diff to GitX
2008-10-21 15:43:26 +02:00