summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)Author
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
2007-02-17Convert update-index references in docs to add.Shawn O. Pearce
2007-02-13git merge documentation: -m is optionalMatthias Lederhofer
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano
2006-12-28Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce
2006-11-22git-merge: make it usable as the first class UIJunio C Hamano
2006-07-09Assorted typo fixesPavel Roskin
2005-12-17Examples of resetting.Junio C Hamano
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano
2005-11-29Documentation: Describe merge operation a bit better.Junio C Hamano
2005-11-07Refactored merge options into separate merge-options.txt.Jon Loeliger
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger
2005-11-05Documentation: git-fetch/pull updates.Junio C Hamano
2005-11-04Documentation: -merge and -pull: describe merge strategies.Junio C Hamano
2005-11-01Documentation for git-fmt-merge-msgPetr Baudis
2005-10-10Remove the version tags from the manpagesJunio C Hamano
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov
2005-09-11'git-merge': Documentation.Junio C Hamano