aboutsummaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
Commit message (Expand)AuthorAge
* merge-options.txt: Clarify merge --squashMichael J Gruber2009-05-25
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-09
* Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-14
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-05
* Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer2008-06-08
* merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-12
* add 'merge.stat' config variableSZEDER Gábor2008-04-12
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-12
* git-merge: add --ff and --no-ff optionsLars Hjemli2007-09-23
* git-merge: add support for --commit and --no-squashLars Hjemli2007-09-23
* War on whitespaceJunio C Hamano2007-06-07
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-24
* git-merge --squashJunio C Hamano2006-06-24
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-08
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-06
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-29 04:21:30 +0000