summaryrefslogtreecommitdiff
path: root/git-gui
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2010-10-16 12:15:10 +0200
committerLibravatar Paul Mackerras <paulus@samba.org>2010-12-12 10:46:52 +1100
commitae4e3ff93df4489579400d8af0629cdd4e5a3e67 (patch)
tree6c6bf0250998dc71a294dbd48d0ee8ffccf80592 /git-gui
parentgitk: Update Swedish translation (290t) (diff)
downloadtgif-ae4e3ff93df4489579400d8af0629cdd4e5a3e67.tar.xz
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>
Diffstat (limited to 'git-gui')
0 files changed, 0 insertions, 0 deletions