Zsh Mailing List Archive Messages sorted by: Reverse Date, Date, Thread, Author

Re: [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc)

X-seq: zsh-workers 35161
From: Daniel Shahaf <d.s@xxxxxxxxxxxxxxxxxx>
To: zsh-workers@xxxxxxx
Subject: Re: [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc)
Date: Sat, 16 May 2015 22:55:27 +0000
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= daniel.shahaf.name; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=mesmtp; bh=JAFUu1kJoLlpZI3+WrXitQ387Dg=; b=XvKYA3 5HuDdg5Awhvmny2/TZ+XXQbpc/C2MPUM/3RGzE+7riLDrn/NiF9DqeJBDZtam1pi v9Gn5JavxhsTQVXDLfITz36AyjSfpxGa/oBLKte0oTb8N8RJVD5X31uurM66UYrq CuMllAI5VSlkMmDyO+15abaWHC03or2J6buIo=
Dkim-signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-sasl-enc :x-sasl-enc; s=smtpout; bh=JAFUu1kJoLlpZI3+WrXitQ387Dg=; b=Nss0z L4q5udm902JU4MsUwxfR4UXmpkAcn/wxgyeKAOUcTFwFdiJGcazeQo19dNBCit8G mYes2IvtE8yDKag2F4DYIy9oEH+L/uyZSA1twX4YV8uPaOW0RAq57D9PWaR8Az9w frgmCssAYvVKnFoHnhXDWKHMZwmWjZ06tgbDsA=
In-reply-to: <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de>
List-help: <mailto:zsh-workers-help@zsh.org>
List-id: Zsh Workers List <zsh-workers.zsh.org>
List-post: <mailto:zsh-workers@zsh.org>
Mailing-list: contact zsh-workers-help@xxxxxxx; run by ezmlm
References: <f9059726c9c756ffcaf3ec45b6c27c2e8999376b.1382290245.git.oystwa@gmail.com> <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.

References:
- [PATCH 1/2] completion: git: split diff options for stages (--theirs, --ours etc)
  - From: Daniel Hahler

Messages sorted by: Reverse Date, Date, Thread, Author