mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-05 11:01:13 +02:00
Code Releases Activity

37031: _git-merge: Exclude ancestors of HEAD from recent commit completion

Browse source 
As done for _git-cherry-pick in a428c6b62c (36328 + 36340).
This commit is contained in:
Daniel Shahaf 2015-10-31 12:52:46 +00:00
parent f59864ce7a
commit 6198f7ffba
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2015-11-13 Daniel Shahaf <d.s@daniel.shahaf.name>
* 37031: Completion/Unix/Command/_git: _git-merge: Exclude
ancestors of HEAD from recent commit completion
* 37025: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
vcs_info git: Add a cherry-pick patch-format

3
Completion/Unix/Command/_git
View file

@ -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] )) ||