summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
Commit message (Expand)AuthorAgeFilesLines
* pull: pass --allow-unrelated-histories to "git merge"jc/merge-refuse-new-rootJunio C Hamano2016-04-211-0/+8
* Documentation: fix misuses of "nor"Justin Lebar2014-03-311-8/+7
* Merge branch 'jc/maint-pull-docfix'Junio C Hamano2014-01-271-3/+6
|\
| * Documentation: "git pull" does not have the "-m" optionjc/maint-pull-docfixJunio C Hamano2014-01-141-3/+6
* | Merge branch 'rh/merge-options-doc-fix'Junio C Hamano2013-06-021-1/+2
|\ \ | |/
| * Documentation/merge-options.txt: restore `-e` optionRichard Hansen2013-05-161-1/+2
* | Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-051-0/+5
|\ \ | |/ |/|
| * merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-311-2/+2
| * merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-311-0/+5
* | Documentation: merging a tag is a special caseJunio C Hamano2013-03-211-1/+2
|/
* Merge branch 'jc/doc-merge-options'Junio C Hamano2012-02-261-11/+11
|\
| * Documentation/merge-options.txt: group "ff" related options togetherjc/doc-merge-optionsJunio C Hamano2012-02-221-11/+11
| * Documentation: fix formatting error in merge-options.txtjs/merge-edit-optionJack Nagel2011-12-051-1/+0
* | merge: use editor by default in interactive sessionsJunio C Hamano2012-01-231-3/+13
|/
* Teach merge the '[-e|--edit]' optionJay Soffian2011-10-121-0/+6
* merge: enable progress reporting for rename detectionJeff King2011-02-211-1/+9
* merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-091-3/+3
* 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