From 6198f7ffbae48230561fdd6996358fd553d954db Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sat, 31 Oct 2015 12:52:46 +0000 Subject: 37031: _git-merge: Exclude ancestors of HEAD from recent commit completion As done for _git-cherry-pick in a428c6b62cb2 (36328 + 36340). --- Completion/Unix/Command/_git | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Completion/Unix/Command/_git') diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 61386bfac..3dfd604e9 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] )) || -- cgit 1.4.1