diff options
| author | Øystein Walle <oystwa@gmail.com> | 2013-10-20 19:40:59 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2013-10-21 17:39:46 +0200 |
| commit | 34ba14e1ec69e3811a72ecc3545e99890bff578a (patch) | |
| tree | 43a472f3328c89803dca65752ebdb61795fe3743 | |
| parent | 610f376f4d3c119c27076afca0edcf99ef53b428 (diff) | |
| download | zsh-34ba14e1ec69e3811a72ecc3545e99890bff578a.tar.gz zsh-34ba14e1ec69e3811a72ecc3545e99890bff578a.tar.xz zsh-34ba14e1ec69e3811a72ecc3545e99890bff578a.zip | |
31853: _git: Add missing column.* config variables
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 14 |
2 files changed, 19 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 3064963d5..f424c83c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-21 Øystein Walle <oystwa@gmail.com> + + * 31853: Completion/Unix/Command/_git: _git: Add missing column.* + config variables + 2013-10-19 Peter Stephenson <p.w.stephenson@ntlworld.com> * 31851: Src/exec.c: execstring() should display string to diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index d6f44e679..620d2c966 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1800,6 +1800,10 @@ _git-config () { blame.date:'date format to use in output::__git_date_formats:iso' 'branch.*.description:branch description:branch description:->string' 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.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' core.attributesfile:'look into this file for attributes in addition to .gitattributes:additional attributes file:_files' core.abbrev:'set the length object names are abbreviated to:length:->int:7' @@ -2374,6 +2378,7 @@ _git-config () { browser:'browser options' clean:'git clean options' color:'color options' + column:'column options' commit:'git commit options' diff:'diff options' difftool:'difftools' @@ -2541,6 +2546,15 @@ _git-config () { always:"always $parts[2]" \ {auto,true,yes,on}:$parts[2] && ret=0 ;; + (column) + __git_config_values -- "$current" "$parts[5]" \ + always:'always show in columns' \ + never:'never show in columns' \ + auto:'show in columns if the output is to the terminal' \ + column:'fill columns before rows (implies "always")' \ + row:'fill rows before columns (implies "akways")' \ + plain:'show in one column (implies "always")' && ret=0 + ;; (commit.cleanup) __git_config_values -- "$current" "$parts[5]" \ strip:'remove both whitespace and commentary lines' \ |