summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamkumar Ramachandra <artagnon@gmail.com>2014-01-05 15:48:04 +0530
committerJunio C Hamano <gitster@pobox.com>2014-01-06 09:17:05 -0800
commit422553df49bee5a5ea3c9106dfb7f1e4cbb54153 (patch)
treeabfbbf552b1faa6dc0bedb8c48dea05fe5b927a8
parentf33c2c0f9e2258a80e6e406af39e9fa3fd6e430e (diff)
downloadgit-422553df49bee5a5ea3c9106dfb7f1e4cbb54153.tar.gz
completion: fix branch.autosetup(merge|rebase)
When attempting to complete $ git config branch.auto<TAB> 'autosetupmerge' and 'autosetuprebase' don't come up. This is because "$cur" is matched with "branch.*" and a list of branches are completed. Add 'autosetupmerge', 'autosetuprebase' as candidates for completion too, using __gitcomp_nl_append (). Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--contrib/completion/git-completion.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 20febffd9d..a57bcbe403 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1841,6 +1841,7 @@ _git_config ()
branch.*)
local pfx="${cur%.*}." cur_="${cur#*.}"
__gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "."
+ __gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_"
return
;;
guitool.*.*)