summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-01 15:16:15 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-01 15:16:15 +0900
commitc2c7d17b030646b40e6764ba34a5ebf66aee77af (patch)
treeb0322c1ef5eab278c7d17bbf7d51ec240055afa5 /Documentation/merge-options.txt
parentMerge branch 'bw/ref-prefix-for-configured-refspec' (diff)
downloadtgif-c2c7d17b030646b40e6764ba34a5ebf66aee77af.tar.xz
A bit more topics before -rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions