summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2015-05-21 00:16:04 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-27 12:37:39 -0700
commit14f8b9b494c990188a4dfe772c384b1be5f8351b (patch)
tree8e584ec29c1841396371b1c52f569e477e11b56b /builtin/merge-recursive.c
parentclone: use OPT_STRING_LIST for --reference (diff)
downloadtgif-14f8b9b494c990188a4dfe772c384b1be5f8351b.tar.xz
clone: reorder --dissociate and --reference options
These options are intimately related, so it makes sense to list them nearby in the "-h" output (they are already adjacent in the manpage). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions