author | Thomas Rast <trast@student.ethz.ch> | |
Sat, 16 Oct 2010 10:15:10 +0000 (12:15 +0200) | ||
committer | Paul Mackerras <paulus@samba.org> | |
Sat, 11 Dec 2010 23:46:52 +0000 (10:46 +1100) | ||
commit | ae4e3ff93df4489579400d8af0629cdd4e5a3e67 | |
tree | 6c6bf0250998dc71a294dbd48d0ee8ffccf80592 | tree | snapshot |
parent | 1cca16eca9094dafe9291eb13ec809e071a0a249 | commit | diff |
gitk: Add the equivalent of diff --color-words
Use the newly added 'diff --word-diff=porcelain' to teach gitk a
color-words mode, with two different modes analogous to the
--word-diff=plain and --word-diff=color settings. These are selected
by a dropdown box.
As an extra twist, automatically enable this word-diff support when
the user mentions a word-diff related option on the command line.
These options were previously ignored because they would break diff
parsing.
Both of these features are only enabled if we have a version of git
that supports --word-diff=porcelain, meaning at least 1.7.2.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Use the newly added 'diff --word-diff=porcelain' to teach gitk a
color-words mode, with two different modes analogous to the
--word-diff=plain and --word-diff=color settings. These are selected
by a dropdown box.
As an extra twist, automatically enable this word-diff support when
the user mentions a word-diff related option on the command line.
These options were previously ignored because they would break diff
parsing.
Both of these features are only enabled if we have a version of git
that supports --word-diff=porcelain, meaning at least 1.7.2.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Paul Mackerras <paulus@samba.org>
gitk | diff | blob | history |