summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
committerJunio C Hamano <gitster@pobox.com>2011-10-05 12:36:26 -0700
commitf52237576ab9ab054e8330ce5dc47f2020cbce74 (patch)
tree047a450219e871af81161578b738d6b2788bbc1a /merge-recursive.c
parentf6be8fbcbafe552a8b60b9c9394203a752de5e06 (diff)
parent91a640ffb6d9dd10c293a575a692d9771b6e13c7 (diff)
downloadgit-f52237576ab9ab054e8330ce5dc47f2020cbce74.tar.gz
Merge branch 'jc/ls-remote-short-help'
* jc/ls-remote-short-help: ls-remote: a lone "-h" is asking for help
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions