summary refs log tree commit diff
diff options
context:
space:
mode:
authorØystein Walle <oystwa@gmail.com>2013-10-20 19:43:29 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2013-10-21 17:40:01 +0200
commite91d90125beb975ae49b9445477c6cae61b286f7 (patch)
treea3e476ce51b1e71634fc1ed69a739a1cc5ebebe0
parent7a37568b8c6a142e9ccbae3a96fb6041a46646f5 (diff)
downloadzsh-e91d90125beb975ae49b9445477c6cae61b286f7.tar.gz
zsh-e91d90125beb975ae49b9445477c6cae61b286f7.tar.xz
zsh-e91d90125beb975ae49b9445477c6cae61b286f7.zip
31861: _git: Add git-clean -i/--interactive support
 - Add -i and --interactive to _git-clean()
 - Add column.clean configuration variable
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e98598fd0..a6e1479bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-21  Øystein Walle  <oystwa@gmail.com>
+
+	* 31861: Completion/Unix/Command/_git: _git: Add git-clean
+	-i/--interactive support
+
 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 db1ff2f3f..25f925f78 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -508,6 +508,7 @@ _git-clean () {
   _arguments -w -C -S -s \
     '-d[also remove untracked directories]' \
     '(-f --force)'{-f,--force}'[required when clean.requireForce is true (default)]' \
+    '(-i --interactive)'{-i,--interactive}'[show what would be done and clean files interactively]' \
     '(-n --dry-run)'{-n,--dry-run}'[only show what would and what would not be removed]' \
     '(-q --quiet)'{-q,--quiet}'[only report errors]' \
     '*'{-e,--exclude=}'[skip files matching specified pattern]:pattern' \
@@ -1803,6 +1804,7 @@ _git-config () {
     cvsexportcommit.cvsdir:'the default location of the CVS checkout to use for the export:cvs export dir:_directories'
     column.ui:'specify whether supported commands should output in columns.::->column:never'
     column.branch:'specify whether to output branch listing in git branch in columns::->column:never'
+    column.clean:'specify the layout when listing items in git clean -i::->column:never'
     column.status:'specify whether to output untracked files in git status in columns::->column:never'
     column.tag:'specify whether to output tag listing in git tag in columns::->column:never'
     core.fileMode:'track changes to the executable bit of files::->bool:true'