summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
AgeCommit message (Expand)AuthorFilesLines
2013-07-03Merge branch 'rh/merge-options-doc-fix' into maintLibravatar Junio C Hamano1-1/+2
2013-05-16Documentation/merge-options.txt: restore `-e` optionLibravatar Richard Hansen1-1/+2
2013-04-05Merge branch 'sg/gpg-sig'Libravatar Junio C Hamano1-0/+5
2013-03-31merge/pull Check for untrusted good GPG signaturesLibravatar Sebastian Götte1-2/+2
2013-03-31merge/pull: verify GPG signatures of commits being mergedLibravatar Sebastian Götte1-0/+5
2013-03-21Documentation: merging a tag is a special caseLibravatar Junio C Hamano1-1/+2
2012-02-26Merge branch 'jc/doc-merge-options'Libravatar Junio C Hamano1-11/+11
2012-02-22Documentation/merge-options.txt: group "ff" related options togetherLibravatar Junio C Hamano1-11/+11
2012-01-23merge: use editor by default in interactive sessionsLibravatar Junio C Hamano1-3/+13
2011-12-05Documentation: fix formatting error in merge-options.txtLibravatar Jack Nagel1-1/+0
2011-10-12Teach merge the '[-e|--edit]' optionLibravatar Jay Soffian1-0/+6
2011-02-21merge: enable progress reporting for rename detectionLibravatar Jeff King1-1/+9
2010-09-09merge: Make '--log' an integer option for number of shortlog entriesLibravatar Ramkumar Ramachandra1-3/+3
2010-04-13Merge branch 'maint'Libravatar Junio C Hamano1-5/+5
2010-04-12Docs: Add -X option to git-merge's synopsis.Libravatar Marc Branchaud1-5/+5
2010-02-24Documentation/git-pull: put verbosity options before merge/fetch onesLibravatar Tay Ray Chuan1-0/+2
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano1-0/+5
2010-01-17Document that merge strategies can now take their own optionsLibravatar Junio C Hamano1-0/+5
2010-01-10Documentation: spell 'git cmd' without dash throughoutLibravatar Thomas Rast1-2/+2
2009-11-10Merge branch 'bg/merge-ff-only'Libravatar Junio C Hamano1-0/+5
2009-10-30Teach 'git merge' and 'git pull' the option --ff-onlyLibravatar Björn Gustavsson1-0/+5
2009-10-22Documentation/merge-options.txt: order options in alphabetical groupsLibravatar Jari Aalto1-43/+45
2009-05-25merge-options.txt: Clarify merge --squashLibravatar Michael J Gruber1-1/+2
2008-12-09Improve language in git-merge.txt and related docsLibravatar Ralf Wildenhues1-1/+1
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-08 04:31:33 +0000