summaryrefslogtreecommitdiff
path: root/Documentation/technical/trivial-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-04-24 16:30:50 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-24 16:30:50 -0700
commitcd33b41c695be45974be38fb2f47768fc1b17190 (patch)
tree8fe251d196337118b2108c7a43a03b6347c798e8 /Documentation/technical/trivial-merge.txt
parentSync with maint (diff)
parenttransport-helper: add 'signed-tags' capability (diff)
downloadtgif-cd33b41c695be45974be38fb2f47768fc1b17190.tar.xz
Merge branch 'jk/remote-helper-with-signed-tags'
Allows remote-helpers to declare they can handle signed tags, and issue a warning when using those that don't. * jk/remote-helper-with-signed-tags: transport-helper: add 'signed-tags' capability transport-helper: pass --signed-tags=warn-strip to fast-export fast-export: add --signed-tags=warn-strip mode
Diffstat (limited to 'Documentation/technical/trivial-merge.txt')
0 files changed, 0 insertions, 0 deletions