about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 06bb8475e..5311ee93a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-09  Clint Adams  <clint@zsh.org>
+
+	* Richard Hartmann: 26114: Completion/Unix/Command/_git: add color
+	options.
+
 2008-12-08  Peter Stephenson  <pws@csr.com>
 
 	* Benjamin R. Haskell: users/13544:
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index b0fcc707f..fcb6a7805 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3158,6 +3158,10 @@ __git_config_name () {
       'color.diff.new:color of added lines'
       'color.diff.commit:color of commit headers'
       'color.diff.whitespace:color of dubious whitespace'
+      'color.interactive:when to color in interactive mode'
+      'color.interactive.header:color of header'
+      'color.interactive.help:color of help'
+      'color.interactive.prompt:color of prompt'
       'color.pager:whether the pager is fed colored output'
       'color.status:when to color output of git-status'
       'color.status.header:color of header text'
@@ -3165,6 +3169,8 @@ __git_config_name () {
       'color.status.updated:color of updated, but not yet committed, files'
       'color.status.changed:color of changed, but not yet added in the index, files'
       'color.status.untracked:color of files not currently being tracked'
+      'commit.template:template file for commit messages'
+      'color.ui:when to color if output is capable; most generic option, overriding by more specific ones'
       'diff.renameLimit:number of files to consider when detecting copy/renames'
       'diff.renames:how hard to try to detect renames'
       'fetch.unpackLimit:maximum number of objects to unpack when fetching'