{"thread":{"id":"35638","subject":"[PATCH 1/2] completion: complete merge-base options","startedAt":"2014-01-11T14:27:12Z","lastAt":"2014-01-11T14:27:13Z","messageCount":2,"participants":["John Keeping"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"233022","messageId":"8a66d7faa732647badcb7ac76c6e90ff7e694686.1389450433.git.john@keeping.me.uk","threadId":"35638","inReplyTo":null,"subject":"[PATCH 1/2] completion: complete merge-base options","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2014-01-11T14:27:12Z","receivedAt":"2014-01-11T14:27:12Z","isPatch":true,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"Signed-off-by: John Keeping <john@keeping.me.uk>\n---\n contrib/completion/git-completion.bash | 6 ++++++\n 1 file changed, 6 insertions(+)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 4fe5ce3..e74d402 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1499,6 +1499,12 @@ _git_mergetool ()\n \n _git_merge_base ()\n {\n+\tcase \"$cur\" in\n+\t--*)\n+\t\t__gitcomp \"--octopus --independent --is-ancestor --fork-point\"\n+\t\treturn\n+\t\t;;\n+\tesac\n \t__gitcomp_nl \"$(__git_refs)\"\n }\n \n-- \n1.8.5.226.g0d60d77\n"},{"id":"233023","messageId":"5754a97b81fde0d3037a1b2a4a57a4bda5a6ebc6.1389450433.git.john@keeping.me.uk","threadId":"35638","inReplyTo":"8a66d7faa732647badcb7ac76c6e90ff7e694686.1389450433.git.john@keeping.me.uk","subject":"[PATCH 2/2] completion: handle --[no-]fork-point options to git-rebase","fromName":"John Keeping","fromEmail":"john@keeping.me.uk","sentAt":"2014-01-11T14:27:13Z","receivedAt":"2014-01-11T14:27:13Z","isPatch":true,"sender":{"key":"john@keeping.me.uk","avatar":"https://avatars.githubusercontent.com/u/1702081?v=4"},"body":"Signed-off-by: John Keeping <john@keeping.me.uk>\n---\n contrib/completion/git-completion.bash | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex e74d402..3c1a11f 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1637,7 +1637,7 @@ _git_rebase ()\n \t\t\t--preserve-merges --stat --no-stat\n \t\t\t--committer-date-is-author-date --ignore-date\n \t\t\t--ignore-whitespace --whitespace=\n-\t\t\t--autosquash\n+\t\t\t--autosquash --fork-point --no-fork-point\n \t\t\t\"\n \n \t\treturn\n-- \n1.8.5.226.g0d60d77\n"}]}