path: root/Documentation/git-merge.txt
AgeCommit message (Expand)Author
2010-01-24Merge branch 'doc-style/for-next' of git:// C Hamano
2010-01-24Documentation: merge: use MERGE_HEAD to refer to the remote branchJonathan Nieder
2010-01-24Documentation: simplify How Merge WorksJonathan Nieder
2010-01-24Documentation: merge: add a section about fast-forwardJonathan Nieder
2010-01-24Documentation: emphasize when git merge terminates earlyJonathan Nieder
2010-01-24Documentation: merge: add an overviewJonathan Nieder
2010-01-24Documentation: merge: move merge strategy list to endJonathan Nieder
2010-01-24Documentation: suggest `reset --merge` in How Merge Works sectionJonathan Nieder
2010-01-24Documentation: merge: move configuration section to endJonathan Nieder
2010-01-21Merge remote branch 'remotes/trast-doc/for-next'Junio C Hamano
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2010-01-10Documentation: format full commands in typewriter fontThomas Rast
2010-01-09Documentation: warn prominently against merging with dirty treesThomas Rast
2010-01-09Documentation/git-merge: reword references to "remote" and "pull"Thomas Rast
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano
2009-10-21modernize fetch/merge/pull examplesClemens Buchacher
2009-10-09Documentation: clarify mergeoptions descriptionJonathan Nieder
2009-10-09Documentation: git fmt-merge-msg does not have to be a scriptJonathan Nieder
2009-08-12Documentation: merge: one <remote> is requiredPaul Bolle
2009-03-26Grammar fix for "git merge" man pageWincent Colaiuta
2009-03-26Grammar fixes to "merge" and "patch-id" docsWincent Colaiuta
2009-03-17Documentation: remove extra quoting/emphasis around literal textsChris Johnsen
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
2008-09-29Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce
2008-09-04Fix AsciiDoc errors in merge documentationJohan Herland
2008-09-01git-merge documentation: describe how conflict is presentedJunio C Hamano
2008-08-23git-merge documentation: more details about resolving conflictsDan Hensgen
2008-07-31Make the DESCRIPTION match <x>... items in the SYNOPSISAbhijit Menon-Sen
2008-07-21Update my e-mail addressJunio C Hamano
2008-07-19Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis
2008-07-08Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder
2008-07-02Documentation formatting and cleanupJonathan Nieder
2008-07-02Documentation: be consistent about "git-" versus "git "Jonathan Nieder
2008-06-06documentation: move git(7) to git(1)Christian Couder
2008-04-13merge, pull: introduce '--(no-)stat' optionSZEDER Gábor
2008-04-13doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor
2008-03-03Fix incorrect wording in git-merge.txt.Matthieu Moy
2008-01-16Documentation: fix and clarify grammar in git-merge docs.Dave Peticolas
2008-01-07Documentation: rename gitlink macro to linkgitDan McGee
2007-12-23Documentation: describe 'union' low-level merge driverJunio C Hamano
2007-10-31Merge branch 'maint' into HEADJunio C Hamano
2007-10-30git-merge: document but discourage the historical syntaxJunio C Hamano
2007-10-03Merge branch 'lh/merge'Junio C Hamano
2007-09-26Fix spelling of overridden in documentationShawn Bohrer
2007-09-24git-merge: add support for branch.<name>.mergeoptionsLars Hjemli
2007-08-02Try to be consistent with capitalization in the documentationSteve Hoelzer
2007-07-13Update git-merge documentation.Jakub Narebski
2007-06-07War on whitespaceJunio C Hamano
2007-05-25Add a configuration option to control diffstat after mergeAlex Riesen