aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2024-01-08Merge branch 'ml/doc-merge-updates'Junio C Hamano1-35/+35
2023-12-20Documentation/git-merge.txt: use backticks for command wrappingMichael Lohmann1-25/+25
2023-12-20Documentation/git-merge.txt: fix reference to synopsisMichael Lohmann1-10/+10
2023-12-15docs: AUTO_MERGE is not that specialJunio C Hamano1-1/+1
2023-10-09documentation: wording improvementsElijah Newren1-1/+1
2023-05-23Documentation: document AUTO_MERGEPhilippe Blain1-2/+7
2023-05-23git-merge.txt: modernize word choice in "True merge" sectionPhilippe Blain1-1/+1
2023-01-13git-merge.txt: mention 'ORIG_HEAD' in the DescriptionPhilippe Blain1-1/+2
2022-09-14Merge branch 'ab/dedup-config-and-command-docs'Junio C Hamano1-1/+4
2022-09-07docs: add and use include template for config/* includesÆvar Arnfjörð Bjarmason1-1/+4
2022-08-03doc: consolidate --rerere-autoupdate descriptionJunio C Hamano1-4/+1
2022-01-05Merge branch 'jc/merge-detached-head-name'Junio C Hamano1-1/+7
2021-12-20merge: allow to pretend a merge is made into a different branchJunio C Hamano1-1/+7
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren1-5/+27
2021-07-22pull: update docs & code for option compatibility with rebasingElijah Newren1-0/+2
2020-05-05Doc: reference the "stash list" in autostash docsDenton Liu1-2/+2
2020-04-10merge: teach --autostash optionDenton Liu1-3/+8
2019-08-07merge: do no-verify like commitMichael J Gruber1-1/+1
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-0/+5
2019-07-09Merge branch 'pw/doc-synopsis-markup-opmode-options'Junio C Hamano1-2/+1
2019-06-17show --continue/skip etc. consistently in synopsisPhillip Wood1-2/+1
2019-06-13Merge branch 'nd/merge-quit'Junio C Hamano1-0/+4
2019-05-19merge: add --quitNguyễn Thái Ngọc Duy1-0/+4
2019-04-02doc: document --overwrite-ignoreNguyễn Thái Ngọc Duy1-0/+5
2019-03-18merge: tweak --rerere-autoupdate documentationPhillip Wood1-1/+2
2018-10-29config.txt: move merge-config.txt to config/Nguyễn Thái Ngọc Duy1-1/+1
2018-08-02Merge branch 'en/dirty-merge-fixes'Junio C Hamano1-3/+3
2018-07-11merge: allow reading the merge commit message from a fileJohannes Schindelin1-1/+9
2018-07-11merge: fix misleading pre-merge check documentationElijah Newren1-3/+3
2018-06-18Merge branch 'mw/doc-merge-enumfix'Junio C Hamano1-1/+1
2018-06-14doc: update the order of the syntax `git merge --continue`Meng-Sung Wu1-1/+1
2017-11-06Merge branch 'wk/pull-signoff'Junio C Hamano1-8/+0
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano1-6/+0
2017-10-13pull: pass --signoff/--no-signoff to "git merge"W. Trevor King1-8/+0
2017-10-12Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'W. Trevor King1-6/+0
2017-09-10Merge branch 'ma/up-to-date'Junio C Hamano1-1/+1
2017-08-26Merge branch 'mg/killed-merge'Junio C Hamano1-1/+4
2017-08-23treewide: correct several "up-to-date" to "up to date"Martin Ågren1-1/+1
2017-08-21Documentation/git-merge: explain --continueMichael J Gruber1-1/+4
2017-07-25merge: add a --signoff flagŁukasz Gryglicki1-0/+8
2017-03-30Merge branch 'jc/merge-drop-old-syntax'Junio C Hamano1-6/+1
2017-03-30Merge branch 'jk/no-looking-at-dotgit-outside-repo-final'Junio C Hamano0-0/+0
2016-12-14merge: add '--continue' option as a synonym for 'git commit'Chris Packham1-0/+8
2016-04-21pull: pass --allow-unrelated-histories to "git merge"Junio C Hamano1-13/+1
2016-03-23merge: refuse to create too cool a merge by defaultJunio C Hamano1-0/+13
2015-10-05Merge branch 'mm/keyid-docs'Junio C Hamano1-2/+4
2015-09-21Documentation: explain optional arguments betterMatthieu Moy1-1/+3
2015-09-21Documentation: use 'keyid' consistently, not 'key-id'Matthieu Moy1-1/+1
2015-09-17Merge branch 'po/doc-branch-desc'Junio C Hamano1-1/+1
2015-09-14doc: show usage of branch descriptionPhilip Oakley1-1/+1
2015-05-19Merge branch 'jc/merge'Junio C Hamano1-0/+4
2015-04-29merge: drop 'git merge <message> HEAD <commit>' syntaxJunio C Hamano1-6/+1
2015-04-29merge: handle FETCH_HEAD internallyJunio C Hamano1-0/+4
2015-03-13*config.txt: stick to camelCase naming conventionNguyễn Thái Ngọc Duy1-2/+2
2014-04-22merge: enable defaulttoupstream by defaultFelipe Contreras1-3/+2
2014-03-24parse-options: multi-word argh should use dash to separate wordsJunio C Hamano1-1/+1
2013-10-18git-merge: document the -S optionNicolas Vigier1-1/+5
2013-09-05Merge branch 'maint-1.8.2' into maint-1.8.3Junio C Hamano1-2/+2
2013-09-05Documentation/git-merge.txt: fix formatting of example blockAndreas Schwab1-2/+2
2013-07-21Merge branch 'mm/merge-in-dirty-worktree-doc' into maintJunio C Hamano1-2/+2
2013-06-18Documentation/git-merge.txt: weaken warning about uncommited changesMatthieu Moy1-2/+2
2013-05-17documentation: trivial style cleanupsFelipe Contreras1-2/+1
2013-04-01Merge branch 'yd/doc-merge-annotated-tag' into maintJunio C Hamano1-0/+24
2013-03-28Merge branch 'yd/doc-merge-annotated-tag'Junio C Hamano1-0/+24
2013-03-21Documentation: merging a tag is a special caseJunio C Hamano1-0/+24
2013-02-01Documentation: the name of the system is 'Git', not 'git'Thomas Ackermann1-2/+2
2012-10-25Documentation: remote tracking branch -> remote-tracking branchMatthieu Moy1-1/+1
2012-07-14doc: A few minor copy edits.Štěpán Němec1-1/+1
2012-01-23merge: use editor by default in interactive sessionsJunio C Hamano1-1/+1
2011-04-01Merge branch 'jc/merge-sans-branch'Junio C Hamano1-3/+8
2011-03-24merge: merge with the default upstream branch without argumentJunio C Hamano1-3/+8
2011-03-11doc: drop author/documentation sections from most pagesJeff King1-9/+0
2010-12-08Merge branch 'jh/notes-merge'Junio C Hamano1-3/+24
2010-11-17Provide 'git merge --abort' as a synonym to 'git reset --merge'Johan Herland1-3/+24
2010-10-29Fix a formatting error in git-merge.txtNathan W. Panike1-7/+7
2010-05-10merge: --log appends shortlog to message if specifiedTay Ray Chuan1-1/+6
2010-04-12Docs: Add -X option to git-merge's synopsis.Marc Branchaud1-1/+2
2010-01-24Merge branch 'doc-style/for-next' of git://repo.or.cz/git/trastJunio C Hamano1-78/+100
2010-01-24Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder1-6/+8
2010-01-24Documentation: simplify How Merge WorksJonathan Nieder1-36/+16
2010-01-24Documentation: merge: add a section about fast-forwardJonathan Nieder1-13/+18
2010-01-24Documentation: emphasize when git merge terminates earlyJonathan Nieder1-10/+21
2010-01-24Documentation: merge: add an overviewJonathan Nieder1-2/+26
2010-01-24Documentation: merge: move merge strategy list to endJonathan Nieder1-2/+2
2010-01-24Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder1-3/+3
2010-01-24Documentation: merge: move configuration section to endJonathan Nieder1-9/+9
2010-01-20Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano1-25/+29
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-3/+3
2010-01-10Documentation: format full commands in typewriter fontThomas Rast1-7/+7
2010-01-09Documentation: warn prominently against merging with dirty treesThomas Rast1-0/+4
2010-01-09Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast1-17/+17
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano1-1/+6
2009-10-21modernize fetch/merge/pull examplesClemens Buchacher1-0/+33
2009-10-09Documentation: clarify mergeoptions descriptionJonathan Nieder1-2/+2
2009-10-09Documentation: git fmt-merge-msg does not have to be a scriptJonathan Nieder1-3/+4
2009-08-12Documentation: merge: one <remote> is requiredPaul Bolle1-1/+1
2009-03-26Grammar fix for "git merge" man pageWincent Colaiuta1-1/+1
2009-03-25Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta1-1/+1
2009-03-17Documentation: remove extra quoting/emphasis around literal textsChris Johnsen1-3/+3
2008-12-09Improve language in git-merge.txt and related docsRalf Wildenhues1-17/+17
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce1-0/+65
2008-09-04Fix AsciiDoc errors in merge documentationJohan Herland1-4/+4
2008-08-31git-merge documentation: describe how conflict is presentedJunio C Hamano1-0/+65
2008-08-22git-merge documentation: more details about resolving conflictsDan Hensgen1-6/+18
2008-07-30Make the DESCRIPTION match <x>... items in the SYNOPSISAbhijit Menon-Sen1-2/+2
2008-07-21Update my e-mail addressJunio C Hamano1-1/+1
2008-07-19Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis1-47/+29
2008-07-08Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt1-1/+3
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder1-8/+8
2008-07-01Documentation formatting and cleanupJonathan Nieder1-6/+8
2008-07-01Documentation: be consistent about "git-" versus "git "Jonathan Nieder1-5/+5
2008-06-06documentation: move git(7) to git(1)Christian Couder1-1/+1
2008-04-12merge, pull: introduce '--(no-)stat' optionSZEDER Gábor1-1/+1
2008-04-12doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor1-12/+1
2008-03-03Fix incorrect wording in git-merge.txt.Matthieu Moy1-1/+2
2008-01-16Documentation: fix and clarify grammar in git-merge docs.Dave Peticolas1-6/+6
2008-01-06Documentation: rename gitlink macro to linkgitDan McGee1-4/+4
2007-12-22Documentation: describe 'union' low-level merge driverJunio C Hamano1-1/+2
2007-10-30Merge branch 'maint' into HEADJunio C Hamano1-5/+6
2007-10-30git-merge: document but discourage the historical syntaxJunio C Hamano1-5/+6
2007-10-03Merge branch 'lh/merge'Junio C Hamano1-0/+4
2007-09-25Fix spelling of overridden in documentationShawn Bohrer1-1/+1
2007-09-23git-merge: add support for branch.<name>.mergeoptionsLars Hjemli1-0/+4
2007-08-01Try to be consistent with capitalization in the documentationSteve Hoelzer1-5/+5
2007-07-12Update git-merge documentation.Jakub Narebski1-0/+15
2007-06-07War on whitespaceJunio C Hamano1-1/+1
2007-05-24Add a configuration option to control diffstat after mergeAlex Riesen1-1/+1
2007-02-17Convert update-index references in docs to add.Shawn O. Pearce1-1/+1
2007-02-12git merge documentation: -m is optionalMatthias Lederhofer1-1/+1
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano1-1/+1
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce1-6/+0
2006-11-21git-merge: make it usable as the first class UIJunio C Hamano1-5/+13
2006-07-09Assorted typo fixesPavel Roskin1-1/+1
2005-12-16Examples of resetting.Junio C Hamano1-0/+5
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano1-4/+6
2005-11-28Documentation: Describe merge operation a bit better.Junio C Hamano1-0/+95
2005-11-06Refactored merge options into separate merge-options.txt.Jon Loeliger1-1/+1
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger1-0/+2
2005-11-05Documentation: git-fetch/pull updates.Junio C Hamano1-1/+1
2005-11-04Documentation: -merge and -pull: describe merge strategies.Junio C Hamano1-9/+2
2005-11-01Documentation for git-fmt-merge-msgPetr Baudis1-0/+10
2005-10-10Remove the version tags from the manpagesJunio C Hamano1-1/+0
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov1-1/+1
2005-09-10'git-merge': Documentation.Junio C Hamano1-0/+52
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-07 04:07:08 +0000