zsh-workers
 help / color / mirror / code / Atom feed
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: Re: [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc)
Date: Sat, 16 May 2015 22:55:27 +0000	[thread overview]
Message-ID: <20150516225527.GI1976@tarsus.local2> (raw)
In-Reply-To: <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de>

Daniel Hahler wrote on Fri, May 08, 2015 at 16:46:44 +0200:
> @@ -6214,14 +6218,20 @@ __git_setup_diff_options () {
> +    '(-c,--cc)'{-b,--cc}'[combined diff format for merge commits]'

This -b should be -c.  I'll fix.


  parent reply	other threads:[~2015-05-16 22:55 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 ` [PATCH 1/7] _git: Add missing column.* config variables Øystein Walle
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     ` Daniel Shahaf [this message]
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=20150516225527.GI1976@tarsus.local2 \
    --to=d.s@daniel.shahaf.name \
    --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).