aboutsummaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
Commit message (Expand)AuthorAge
* Documentation: fix misuses of "nor"Justin Lebar2014-03-31
* Merge branch 'jc/maint-pull-docfix'Junio C Hamano2014-01-27
|\
| * Documentation: "git pull" does not have the "-m" optionJunio C Hamano2014-01-14
* | Merge branch 'rh/merge-options-doc-fix'Junio C Hamano2013-06-02
|\ \ | |/
| * Documentation/merge-options.txt: restore `-e` optionRichard Hansen2013-05-16
* | Merge branch 'sg/gpg-sig'Junio C Hamano2013-04-05
|\ \ | |/ |/|
| * merge/pull Check for untrusted good GPG signaturesSebastian Götte2013-03-31
| * merge/pull: verify GPG signatures of commits being mergedSebastian Götte2013-03-31
* | Documentation: merging a tag is a special caseJunio C Hamano2013-03-21
|/
* Merge branch 'jc/doc-merge-options'Junio C Hamano2012-02-26
|\
| * Documentation/merge-options.txt: group "ff" related options togetherJunio C Hamano2012-02-22
| * Documentation: fix formatting error in merge-options.txtJack Nagel2011-12-05
* | merge: use editor by default in interactive sessionsJunio C Hamano2012-01-23
|/
* Teach merge the '[-e|--edit]' optionJay Soffian2011-10-12
* merge: enable progress reporting for rename detectionJeff King2011-02-21
* merge: Make '--log' an integer option for number of shortlog entriesRamkumar Ramachandra2010-09-09
* Merge branch 'maint'Junio C Hamano2010-04-13
|\
| * Docs: Add -X option to git-merge's synopsis.Marc Branchaud2010-04-12
* | Documentation/git-pull: put verbosity options before merge/fetch onesTay Ray Chuan2010-02-24
|/
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\
| * Document that merge strategies can now take their own optionsJunio C Hamano2010-01-17
* | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
|/
* Merge branch 'bg/merge-ff-only'Junio C Hamano2009-11-10
|\
| * Teach 'git merge' and 'git pull' the option --ff-onlyBjörn Gustavsson2009-10-30
* | Documentation/merge-options.txt: order options in alphabetical groupsJari Aalto2009-10-22
|/
* 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