summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
AgeCommit message (Expand)AuthorFilesLines
2008-11-14Teach/Fix pull/fetch -q/-v optionsLibravatar Tuncer Ayaz1-0/+8
2008-07-05manpages: italicize git command names (which were in teletype font)Libravatar Jonathan Nieder1-2/+2
2008-06-08Docs: Use "-l::\n--long\n" format in OPTIONS sectionsLibravatar Stephan Beyer1-3/+6
2008-04-12merge, pull: add '--(no-)log' command line optionLibravatar SZEDER Gábor1-0/+9
2008-04-12add 'merge.stat' config variableLibravatar SZEDER Gábor1-1/+1
2008-04-12merge, pull: introduce '--(no-)stat' optionLibravatar SZEDER Gábor1-2/+6
2007-09-23git-merge: add --ff and --no-ff optionsLibravatar Lars Hjemli1-0/+9
2007-09-23git-merge: add support for --commit and --no-squashLibravatar Lars Hjemli1-0/+8
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-05-24Add a configuration option to control diffstat after mergeLibravatar Alex Riesen1-0/+4
2006-06-24git-merge --squashLibravatar Junio C Hamano1-0/+8
2005-12-08Documentation: recursive is the default strategy these days.Libravatar Junio C Hamano1-1/+1
2005-11-06Refactored merge options into separate merge-options.txt.Libravatar Jon Loeliger1-0/+16
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 07:13:53 +0000