mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jk/complete-merge-base'
* jk/complete-merge-base: completion: handle --[no-]fork-point options to git-rebase completion: complete merge-base options
This commit is contained in:
commit
ba98a2f660
|
@ -1499,6 +1499,12 @@ _git_mergetool ()
|
|||
|
||||
_git_merge_base ()
|
||||
{
|
||||
case "$cur" in
|
||||
--*)
|
||||
__gitcomp "--octopus --independent --is-ancestor --fork-point"
|
||||
return
|
||||
;;
|
||||
esac
|
||||
__gitcomp_nl "$(__git_refs)"
|
||||
}
|
||||
|
||||
|
@ -1631,7 +1637,7 @@ _git_rebase ()
|
|||
--preserve-merges --stat --no-stat
|
||||
--committer-date-is-author-date --ignore-date
|
||||
--ignore-whitespace --whitespace=
|
||||
--autosquash
|
||||
--autosquash --fork-point --no-fork-point
|
||||
"
|
||||
|
||||
return
|
||||
|
|
Loading…
Reference in a new issue