summaryrefslogtreecommitdiff
path: root/merge-ort.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2021-05-11 15:27:23 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-05-11 15:27:23 +0900
commit2cd6ce21f38b9dab1b3a75f05b24e92bdc4b5b93 (patch)
treea0c20003fd8f97af37218e25292947790212f128 /merge-ort.h
parentMerge branch 'jk/symlinked-dotgitx-cleanup' (diff)
parenttrailer: add new .cmd config option (diff)
downloadtgif-2cd6ce21f38b9dab1b3a75f05b24e92bdc4b5b93.tar.xz
Merge branch 'zh/trailer-cmd'
The way the command line specified by the trailer.<token>.command configuration variable receives the end-user supplied value was both error prone and misleading. An alternative to achieve the same goal in a safer and more intuitive way has been added, as the trailer.<token>.cmd configuration variable, to replace it. * zh/trailer-cmd: trailer: add new .cmd config option docs: correct descript of trailer.<token>.command
Diffstat (limited to 'merge-ort.h')
0 files changed, 0 insertions, 0 deletions