| commit | 850896042a42c1c16912a3981ca844e2cbcd14d4 | |
| author | Tim Henigan <tim.henigan@gmail.com> | |
| Thu, 22 Mar 2012 19:52:17 +0000 (22 15:52 -0400) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 23 Mar 2012 18:46:25 +0000 (23 11:46 -0700) | ||
| tree | f38da913cd54a31969bff0381abbbc12642b8249 | treesnapshot (tar.gz zip) |
| parent | 3f94ff755e266520ba2f6007d557395c33d30fdc | commitdiff |
difftool: add '--no-gui' option
This commit teaches difftool to handle the '--no-gui' option. This option
negates the existing '--gui' option. The last setting given on the command
line wins.
This allows a user to configure "[alias] mdt = difftool --gui", but still
have the ability to override the setting without error:
$ git mdt --no-gui
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit teaches difftool to handle the '--no-gui' option. This option
negates the existing '--gui' option. The last setting given on the command
line wins.
This allows a user to configure "[alias] mdt = difftool --gui", but still
have the ability to override the setting without error:
$ git mdt --no-gui
Signed-off-by: Tim Henigan <tim.henigan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-difftool.perl | diffblobblamehistory | |
| t/t7800-difftool.sh | diffblobblamehistory |