summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-05 12:45:40 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-05 12:45:40 -0800
commitfec7b79aa469eec2fa184b1ff7f8e41fb6fa632c (patch)
tree90b2ff2fabdeb0aaf849c320917468d828ecf5dd /ll-merge.c
parentMerge branch 'mh/refs-have-new' (diff)
parentDocumentation/git-am.txt: mention mailinfo.scissors config variable (diff)
downloadtgif-fec7b79aa469eec2fa184b1ff7f8e41fb6fa632c.tar.xz
Merge branch 'mm/am-c-doc'
The configuration variable 'mailinfo.scissors' was hard to discover in the documentation. * mm/am-c-doc: Documentation/git-am.txt: mention mailinfo.scissors config variable Documentation/config.txt: document mailinfo.scissors
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions