diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:33:39 -0800 |
| commit | 30159e530d5424c47661925bdefe4d7abda57083 (patch) | |
| tree | cf7cd7e95db73775ee8b4e8b476f2595af5f0c0e /builtin/merge-recursive.c | |
| parent | Merge branch 'js/lift-parent-count-limit' (diff) | |
| parent | completion: fix remote.pushdefault (diff) | |
| download | tgif-30159e530d5424c47661925bdefe4d7abda57083.tar.xz | |
Merge branch 'rr/completion-branch-config'
Two-level configuration variable names in "branch.*" and "remote.*"
hierarchies whose variables are predominantly three-level where not
completed by hitting a <TAB> in bash and zsh completions.
* rr/completion-branch-config:
completion: fix remote.pushdefault
completion: fix branch.autosetup(merge|rebase)
completion: introduce __gitcomp_nl_append ()
zsh completion: find matching custom bash completion
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions