From: "Øystein Walle" <oystwa@gmail.com>
To: zsh-workers@zsh.org
Cc: "Øystein Walle" <oystwa@gmail.com>
Subject: [PATCH 1/7] _git: Add missing column.* config variables
Date: Sun, 20 Oct 2013 19:40:59 +0200 [thread overview]
Message-ID: <87ac1d265f9a950804ee439143cde954b6f17548.1382290245.git.oystwa@gmail.com> (raw)
In-Reply-To: <cover.1382290245.git.oystwa@gmail.com>
In-Reply-To: <cover.1382290245.git.oystwa@gmail.com>
---
Completion/Unix/Command/_git | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index d6f44e6..620d2c9 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' \
--
1.8.4.1.516.g1d25dd4
next prev parent reply other threads:[~2013-10-20 17:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-20 17:40 [PATCH 0/7] Various fixes to Git completion Øystein Walle
2013-10-20 17:40 ` Øystein Walle [this message]
2013-10-20 17:41 ` [PATCH 2/7] _git: Make git-show accept diff arguments Øystein Walle
2015-05-08 14:46 ` [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc) Daniel Hahler
2015-05-08 14:46 ` [PATCH 2/2] completion: git: do not add diff options twice Daniel Hahler
2015-05-16 22:55 ` [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc) Daniel Shahaf
2013-10-20 17:41 ` [PATCH 3/7] _git: re-order the last two git-blame arguments Øystein Walle
2013-10-20 17:41 ` [PATCH 4/7] _git: Remove unsupported -q option from diff options Øystein Walle
2013-10-20 17:41 ` [PATCH 5/7] _git: fix wrong default value Øystein Walle
2013-10-20 17:41 ` [PATCH 6/7] _git: fix a few "undocumented" options Øystein Walle
2013-10-20 17:41 ` [PATCH 7/7] _git: revert: add '-e,--edit' Øystein Walle
2013-10-21 10:28 ` [PATCH 0/7] Various fixes to Git completion Frank Terbeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ac1d265f9a950804ee439143cde954b6f17548.1382290245.git.oystwa@gmail.com \
--to=oystwa@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).