summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar ZheNing Hu <adlternative@gmail.com>2021-03-23 13:55:57 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-03-23 10:31:38 -0700
commit2daae3d1d1bf513f1e1c00f1e4df75e1cb500e0f (patch)
tree80c488543732db29ca376021d7fe39dcbe4f6e29 /xdiff/xmerge.c
parentThe second batch (diff)
downloadtgif-2daae3d1d1bf513f1e1c00f1e4df75e1cb500e0f.tar.xz
commit: add --trailer option
Historically, Git has supported the 'Signed-off-by' commit trailer using the '--signoff' and the '-s' option from the command line. But users may need to provide other trailer information from the command line such as "Helped-by", "Reported-by", "Mentored-by", Now implement a new `--trailer <token>[(=|:)<value>]` option to pass other trailers to `interpret-trailers` and insert them into commit messages. Signed-off-by: ZheNing Hu <adlternative@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions