summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-06-11 09:29:52 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-06-11 09:29:52 -0700
commit82b416e063d9b1497eac78a8deaad340d251f1dc (patch)
treeae5149eb8b38c8606c29dafc7180e2500d041acf /ll-merge.c
parentMerge branch 'jc/diff-ws-error-highlight' (diff)
parentclone: reorder --dissociate and --reference options (diff)
downloadtgif-82b416e063d9b1497eac78a8deaad340d251f1dc.tar.xz
Merge branch 'jk/clone-dissociate'
Code clean-up. * jk/clone-dissociate: clone: reorder --dissociate and --reference options clone: use OPT_STRING_LIST for --reference
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions