about summary refs log tree commit diff
diff options
context:
space:
mode:
authorØystein Walle <oystwa@gmail.com>2013-10-20 19:43:31 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2013-10-21 17:40:07 +0200
commitbaee0a2295c7d6de79c7aa576c5a7cea30c9fd5d (patch)
tree3172fa8bf7e3a126c58a6b5d7e2aec66b946c337
parent805b6659019ae5ab7bfe9b7e78f48f35db568f9d (diff)
downloadzsh-baee0a2295c7d6de79c7aa576c5a7cea30c9fd5d.tar.gz
zsh-baee0a2295c7d6de79c7aa576c5a7cea30c9fd5d.tar.xz
zsh-baee0a2295c7d6de79c7aa576c5a7cea30c9fd5d.zip
31862: _git: Add status.short and status.branch
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 62af20e16..0dbf17111 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
 	* 31863: Completion/Unix/Command/_git: _git: Add new arguments
 	introduced in Git v1.8.4
 
+	* 31862: Completion/Unix/Command/_git: _git: Add status.short and
+	status.branch
+
 2013-10-21  m0viefreak  <m0viefreak.cm@googlemail.com>
 
 	* 31856: Completion/Unix/Command/_git: _git: fix a few
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 5b1e71063..eb2da110b 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -2199,6 +2199,8 @@ _git-config () {
     status.relativePaths:'show paths relative to current directory::->bool:false'
     status.showUntrackedFiles:'show untracked files::->status.showUntrackedFiles:normal'
     status.submodulesummary:'include submodule summary::->bool:false'
+    status.branch:'show branch and tracking info in short format::->bool:false'
+    status.short:'use short format by default::->bool:false'
     'submodule.*.branch:remote branch name for a submodule:branch name:->string'
     'submodule.*.fetchRecurseSubmodules:fetch commits of submodules::->bool'
     'submodule.*.path:path within project:submodule directory:_directories -qS \:'