push: add a config option push.gpgSign for default signed pushes

diff --git a/diff.h b/diff.h
index b4a624d235748bf13be44e7479f086880dcf574f..1ac058222800eb31acbf06ff918e0ce4dd79e937 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -175,7 +175,7 @@ struct diff_options {
 
 enum color_diff {
        DIFF_RESET = 0,
-       DIFF_PLAIN = 1,
+       DIFF_CONTEXT = 1,
        DIFF_METAINFO = 2,
        DIFF_FRAGINFO = 3,
        DIFF_FILE_OLD = 4,