summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-21 14:55:50 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-21 14:55:50 -0800
commit014578e0d0afde6484517d3bd9c3e56f5dea6581 (patch)
tree905092667a7f2cb372a0b7e98e93d6bea0bacdc9 /ll-merge.c
parentcompletion: Allow dash as the first character for __git_ps1 (diff)
parentcompletion: simplify __gitcomp and __gitcomp_nl implementations (diff)
downloadtgif-014578e0d0afde6484517d3bd9c3e56f5dea6581.tar.xz
Merge branch 'fc/zsh-completion' into maint
* fc/zsh-completion: completion: simplify __gitcomp and __gitcomp_nl implementations completion: use ls -1 instead of rolling a loop to do that ourselves completion: work around zsh option propagation bug
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions