From a16b71b0d07be97f32a7759d14c426e82ab53ca6 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 19 Nov 2015 18:41:13 +0100 Subject: [PATCH] saving uncommitted changes in /etc prior to emerge run --- colordiffrc | 8 ++++---- colordiffrc-gitdiff | 30 ++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 colordiffrc-gitdiff diff --git a/colordiffrc b/colordiffrc index 4bcb02d2..1ac1a178 100644 --- a/colordiffrc +++ b/colordiffrc @@ -23,7 +23,7 @@ diff_cmd=diff # this, use the default output colour" # plain=off -newtext=blue -oldtext=red -diffstuff=magenta -cvsstuff=green +newtext=darkgreen +oldtext=darkred +diffstuff=darkcyan +cvsstuff=cyan diff --git a/colordiffrc-gitdiff b/colordiffrc-gitdiff new file mode 100644 index 00000000..f0d78129 --- /dev/null +++ b/colordiffrc-gitdiff @@ -0,0 +1,30 @@ +# Example colordiffrc file for dark backgrounds with colour +# defaults set to match 'git diff' +# +# Set banner=no to suppress authorship info at top of +# colordiff output +banner=no +# By default, when colordiff output is being redirected +# to a file, it detects this and does not colour-highlight +# To make the patch file *include* colours, change the option +# below to 'yes' +color_patches=no +# Sometimes it can be useful to specify which diff command to +# use: that can be specified here +diff_cmd=diff +# +# available colours are: white, yellow, green, blue, +# cyan, red, magenta, black, +# darkwhite, darkyellow, darkgreen, +# darkblue, darkcyan, darkred, +# darkmagenta, darkblack +# +# Can also specify 'none', 'normal' or 'off' which are all +# aliases for the same thing, namely "don't colour highlight +# this, use the default output colour" +# +plain=off +newtext=darkgreen +oldtext=darkred +diffstuff=darkcyan +cvsstuff=white -- 2.39.5