zsh-workers
 help / color / mirror / code / Atom feed
From: "Øystein Walle" <oystwa@gmail.com>
To: zsh-workers@zsh.org
Cc: m0viefreak.cm@googlemail.com, "Øystein Walle" <oystwa@gmail.com>
Subject: [PATCH 14/16] _git: move --(no-)follow to be log-specific option
Date: Sun, 28 Jul 2013 18:22:11 +0200	[thread overview]
Message-ID: <571699780045f1b9cf7b342c899db9eee17c8c92.1375006129.git.oystwa@gmail.com> (raw)
In-Reply-To: <cover.1375006129.git.oystwa@gmail.com>
In-Reply-To: <cover.1375006129.git.oystwa@gmail.com>

---
 Completion/Unix/Command/_git | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 55054b0..9b15d57 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -5856,6 +5856,8 @@ __git_setup_log_options () {
     '(- *)-h[display help]'
     '(           --no-decorate)--decorate=-[print out ref names of any commits that are shown]: :__git_log_decorate_formats'
     '(--decorate              )--no-decorate[do not print out ref names of any commits that are shown]'
+    '(          --no-follow)--follow[follow renames]'
+    '(--follow             )--no-follow[do not follow renames]'
     '--source[show which ref each commit is reached from]')
 }
 
@@ -5926,8 +5928,6 @@ __git_setup_diff_options () {
     '(--ext-diff              )--no-ext-diff[disallow external diff helper to be executed]'
     '(--textconv --no-textconv)--textconv[allow external text conversion filters to be run when comparing binary files]'
     '(--textconv --no-textconv)--no-textconv[do not allow external text conversion filters to be run when comparing binary files]'
-    '(          --no-follow)--follow[follow renames]'
-    '(--follow             )--no-follow[do not follow renames]'
     '--ignore-submodules[ignore changes to submodules]:: :__git_ignore_submodules_whens'
     '(--no-prefix)--src-prefix=[use given prefix for source]:prefix'
     '(--no-prefix)--dst-prefix=[use given prefix for destination]:prefix'
-- 
1.8.2.2


  parent reply	other threads:[~2013-07-28 16:23 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-28 16:21 [PATCH 00/16] Improvements to the Git completion functions Øystein Walle
2013-07-28 16:21 ` [PATCH 01/16] _git: fix a wrong variable in __git_config_values Øystein Walle
2013-07-28 16:21 ` [PATCH 02/16] _git: fix usage of ->int: for some entries in _git-config Øystein Walle
2013-07-28 16:22 ` [PATCH 03/16] _git: make git submodule <cmd> completion work Øystein Walle
2013-07-28 16:22 ` [PATCH 04/16] _git: correctly use __git_guard_number in some cases Øystein Walle
2013-07-28 16:22 ` [PATCH 05/16] _git: completion updates to match latest git v1.8.3 Øystein Walle
2013-07-28 16:22 ` [PATCH 06/16] _git: completion updates to match latest git v1.8.3 part 2 Øystein Walle
2013-07-28 16:22 ` [PATCH 07/16] _git: add new configuration options to match latest git v1.8.3 Øystein Walle
2013-07-28 16:22 ` [PATCH 08/16] _git: reword _git-config TODO Øystein Walle
2013-07-28 16:22 ` [PATCH 09/16] _git: support completing remote branches without <remote>/ prefix Øystein Walle
2013-07-28 16:22 ` [PATCH 10/16] _git: fix some typos Øystein Walle
2013-07-28 16:22 ` [PATCH 11/16] _git: remove TODOs of actually documented options Øystein Walle
2013-07-30 14:40   ` Nikolai Weibull
2013-07-30 18:01     ` Øystein Walle
2013-07-30 20:41       ` Nikolai Weibull
2013-07-28 16:22 ` [PATCH 12/16] _git: correct some "undocumented" options Øystein Walle
2013-07-30 14:39   ` Nikolai Weibull
2013-07-30 16:06     ` m0viefreak
2013-07-30 20:45       ` Nikolai Weibull
2013-07-28 16:22 ` [PATCH 13/16] _git: change completion text for consistency Øystein Walle
2013-07-28 16:22 ` Øystein Walle [this message]
2013-07-28 16:22 ` [PATCH 15/16] _git: git rm: make git rm --cached work as intended Øystein Walle
2013-07-30 14:37   ` Nikolai Weibull
2013-07-30 15:04     ` Aaron Schrab
2013-07-30 15:47       ` Nikolai Weibull
2013-07-28 16:22 ` [PATCH 16/16] _git: Document --early-output Øystein Walle
2013-07-30 14:35   ` Nikolai Weibull
2013-07-30 16:31     ` Øystein Walle
2013-07-30 20:42       ` Nikolai Weibull
2013-07-28 17:25 ` [PATCH 00/16] Improvements to the Git completion functions Peter Stephenson

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=571699780045f1b9cf7b342c899db9eee17c8c92.1375006129.git.oystwa@gmail.com \
    --to=oystwa@gmail.com \
    --cc=m0viefreak.cm@googlemail.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).