* [PATCH] _git-merge: Exclude ancestors of HEAD from recent commit completion
@ 2015-10-31 12:52 Daniel Shahaf
0 siblings, 0 replies; only message in thread
From: Daniel Shahaf @ 2015-10-31 12:52 UTC (permalink / raw)
To: zsh-workers; +Cc: Mateusz Karbowy
As done for _git-cherry-pick in a428c6b62cb2 (36328 + 36340).
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index ad1037e..110f154 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1131,6 +1131,7 @@ _git-log () {
_git-merge () {
local -a merge_options
__git_setup_merge_options
+ local -a git_commit_opts=(--all --not HEAD --not)
_arguments -w -S -s \
$merge_options \
@@ -1138,7 +1139,7 @@ _git-merge () {
'( --no-rerere-autoupdate)--rerere-autoupdate[allow the rerere mechanism to update the index]' \
'(--rerere-autoupdate )--no-rerere-autoupdate[do not allow the rerere mechanism to update the index]' \
'--abort[restore the original branch and abort the merge operation]' \
- '*: :__git_commits'
+ '*: : __git_commits -O expl:git_commit_opts'
}
(( $+functions[_git-mv] )) ||
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-10-31 13:02 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-31 12:52 [PATCH] _git-merge: Exclude ancestors of HEAD from recent commit completion Daniel Shahaf
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).