{"thread":{"id":"45279","subject":"[PATCH v2 4/5] Add guitool completions for diff and mergetools","startedAt":"2017-03-03T14:39:36Z","lastAt":"2017-03-03T14:39:36Z","messageCount":1,"participants":["Denton Liu"],"isPatch":true,"patchVersion":2,"patchTotal":5},"messages":[{"id":"313177","messageId":"20170303134038.GA6274@arch-attack.localdomain","threadId":"45279","inReplyTo":null,"subject":"[PATCH v2 4/5] Add guitool completions for diff and mergetools","fromName":"Denton Liu","fromEmail":"liu.denton@gmail.com","sentAt":"2017-03-03T13:40:38Z","receivedAt":"2017-03-03T14:39:36Z","isPatch":true,"sender":{"key":"liu.denton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/9620836?v=4"},"body":"Signed-off-by: Denton Liu <liu.denton@gmail.com>\n---\n contrib/completion/git-completion.bash | 6 ++++--\n 1 file changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash\nindex 41ee52991..c94e38a3a 100644\n--- a/contrib/completion/git-completion.bash\n+++ b/contrib/completion/git-completion.bash\n@@ -1277,7 +1277,7 @@ _git_difftool ()\n \t\t\t--base --ours --theirs\n \t\t\t--no-renames --diff-filter= --find-copies-harder\n \t\t\t--relative --ignore-submodules\n-\t\t\t--tool=\"\n+\t\t\t--tool= --gui\"\n \t\treturn\n \t\t;;\n \tesac\n@@ -1584,7 +1584,7 @@ _git_mergetool ()\n \t\treturn\n \t\t;;\n \t--*)\n-\t\t__gitcomp \"--tool= --prompt --no-prompt\"\n+\t\t__gitcomp \"--tool= --prompt --no-prompt --gui\"\n \t\treturn\n \t\t;;\n \tesac\n@@ -2207,6 +2207,7 @@ _git_config ()\n \t\tdiff.submodule\n \t\tdiff.suppressBlankEmpty\n \t\tdiff.tool\n+\t\tdiff.guitool\n \t\tdiff.wordRegex\n \t\tdiff.algorithm\n \t\tdifftool.\n@@ -2308,6 +2309,7 @@ _git_config ()\n \t\tmerge.renormalize\n \t\tmerge.stat\n \t\tmerge.tool\n+\t\tmerge.guitool\n \t\tmerge.verbosity\n \t\tmergetool.\n \t\tmergetool.keepBackup\n-- \n2.12.0.5.gfbc750a84\n\n"}]}