# [PATCH 1/2] completion: complete merge-base options 2 messages from 2014-01-11 to 2014-01-11. Participants: John Keeping. Thread: https://gitlist.dev/t/35638 ## John Keeping, 2014-01-11 14:27 Subject: [PATCH 1/2] completion: complete merge-base options Message-ID: <8a66d7faa732647badcb7ac76c6e90ff7e694686.1389450433.git.john@keeping.me.uk> URL: https://gitlist.dev/e/8a66d7faa732647badcb7ac76c6e90ff7e694686.1389450433.git.john%40keeping.me.uk ``` Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 4fe5ce3..e74d402 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)" } -- 1.8.5.226.g0d60d77 ``` ## John Keeping, 2014-01-11 14:27 Subject: [PATCH 2/2] completion: handle --[no-]fork-point options to git-rebase Message-ID: <5754a97b81fde0d3037a1b2a4a57a4bda5a6ebc6.1389450433.git.john@keeping.me.uk> URL: https://gitlist.dev/e/5754a97b81fde0d3037a1b2a4a57a4bda5a6ebc6.1389450433.git.john%40keeping.me.uk In-Reply-To: <8a66d7faa732647badcb7ac76c6e90ff7e694686.1389450433.git.john@keeping.me.uk> ``` Signed-off-by: John Keeping --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index e74d402..3c1a11f 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1637,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 -- 1.8.5.226.g0d60d77 ```