saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index 76db010ed65865870e9aa4d05de1ddc5da1d484d..76b3941626900ed713031dd11d02bed43bfad6e2 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -399,6 +399,7 @@ maybe chmod 0644 'chktexrc'
 maybe chmod 0755 'cifs-utils'
 maybe chmod 0644 'clamd.conf'
 maybe chmod 0644 'colordiffrc'
+maybe chmod 0644 'colordiffrc-gitdiff'
 maybe chmod 0644 'colordiffrc-lightbg'
 maybe chmod 0755 'conf.d'
 maybe chmod 0644 'conf.d/apache2'

diff --git a/colordiffrc b/colordiffrc
index 4bcb02d2e064b3a46404ade5ae8a5bb9474d28ca..1ac1a1786874a73e2a44f906808d0a1e6ca79714 100644 (file)
--- 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 (file)
index 0000000..f0d7812
--- /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