summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Junio C Hamano2010-04-131-5/+5
|\
| * Docs: Add -X option to git-merge's synopsis.Marc Branchaud2010-04-121-5/+5
* | Documentation/git-pull: put verbosity options before merge/fetch onesTay Ray Chuan2010-02-241-0/+2
|/
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-0/+5
|\
| * Document that merge strategies can now take their own optionsJunio C Hamano2010-01-171-0/+5
* | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-2/+2
|/
* Merge branch 'bg/merge-ff-only'Junio C Hamano2009-11-101-0/+5
|\
| * Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-301-0/+5
* | Documentation/merge-options.txt: order options in alphabetical groupsJari Aalto2009-10-221-43/+45
|/
* merge-options.txt: Clarify merge --squashMichael J Gruber2009-05-251-1/+2
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-091-1/+1
* Teach/Fix pull/fetch -q/-v optionsTuncer Ayaz2008-11-141-0/+8
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-2/+2
* Docs: Use "-l::\n--long\n" format in OPTIONS sectionsStephan Beyer2008-06-081-3/+6
* merge, pull: add '--(no-)log' command line optionSZEDER Gábor2008-04-121-0/+9
* add 'merge.stat' config variableSZEDER Gábor2008-04-121-1/+1
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-121-2/+6
* git-merge: add --ff and --no-ff optionsLars Hjemli2007-09-231-0/+9
* git-merge: add support for --commit and --no-squashLars Hjemli2007-09-231-0/+8
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-241-0/+4
* git-merge --squashJunio C Hamano2006-06-241-0/+8
* Documentation: recursive is the default strategy these days.Junio C Hamano2005-12-081-1/+1
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-061-0/+16
View Lorry Controller Status