aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.txt (follow)
AgeCommit message (Expand)AuthorFilesLines
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
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-05 09:12:58 +0000