completion: fix branch.autosetup(merge|rebase)
commit422553df49bee5a5ea3c9106dfb7f1e4cbb54153
authorRamkumar Ramachandra <artagnon@gmail.com>
Sun, 5 Jan 2014 10:18:04 +0000 (5 15:48 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Jan 2014 17:17:05 +0000 (6 09:17 -0800)
treeabfbbf552b1faa6dc0bedb8c48dea05fe5b927a8
parentf33c2c0f9e2258a80e6e406af39e9fa3fd6e430e
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>
contrib/completion/git-completion.bash