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

PATCH: git merge --ff-only

X-seq: zsh-workers 30317
From: Clint Adams <clint@xxxxxxx>
To: zsh-workers@xxxxxxx
Subject: PATCH: git merge --ff-only
Date: Tue, 6 Mar 2012 02:32:11 +0000
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

Other `git merge` options seem to be missing: --progress, --no-progress,
--abort

Index: Completion/Unix/Command/_git
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v
retrieving revision 1.165
diff -u -r1.165 _git
--- Completion/Unix/Command/_git	10 Feb 2012 17:09:10 -0000	1.165
+++ Completion/Unix/Command/_git	6 Mar 2012 02:30:04 -0000
@@ -5753,6 +5753,7 @@
     '(--stat -n --no-stat)'{-n,--no-stat}'[do not show diffstat at the end of the merge]'
     '(         --no-squash)--squash[merge, but do not commit]'
     '(--squash            )--no-squash[merge and commit]'
+    '--ff-only[refuse to merge unless HEAD is up to date or merge can be reolved as a fast-forward]'
     '*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
     '*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
     '(-q --quiet -v --verbose)'{-q,--quiet}'[suppress all output]'

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