diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:43:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-27 10:43:55 -0800 |
| commit | ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60 (patch) | |
| tree | 49453cb22fd186eb27b69219622c83ce33b91052 /contrib/completion | |
| parent | c9e8c1aa3fdcc7b55d1e7f2d400e0d16758f6b77 (diff) | |
| parent | 4310e328d416be00e58e90b69ed3b62f5845c744 (diff) | |
| download | git-ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60.tar.gz git-ba98a2f6604fd2f9107ca9aec7d9b25e10a9ad60.tar.xz | |
Merge branch 'jk/complete-merge-base'
* jk/complete-merge-base:
completion: handle --[no-]fork-point options to git-rebase
completion: complete merge-base options
Diffstat (limited to 'contrib/completion')
| -rw-r--r-- | contrib/completion/git-completion.bash | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 8aaf214b7..9525343fc 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -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 |