summaryrefslogtreecommitdiff
path: root/Documentation/merge-config.txt
AgeCommit message (Expand)AuthorFilesLines
2008-08-05Documentation: typos / spelling fixesLibravatar Mike Ralphson1-2/+2
2008-05-03add merge.renamelimit config optionLibravatar Jeff King1-0/+5
2008-04-12fmt-merge-msg: add '--(no-)log' options and 'merge.log' config variableLibravatar SZEDER Gábor1-1/+1
2008-04-12add 'merge.stat' config variableLibravatar SZEDER Gábor1-0/+4
2008-04-12doc: moved merge.* config variables into separate merge-config.txtLibravatar SZEDER Gábor1-0/+31