aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
Commit message (Expand)AuthorAge
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-09
* Merge branch 'jc/better-conflict-resolution'Shawn O. Pearce2008-09-29
|\
| * Fix AsciiDoc errors in merge documentationJohan Herland2008-09-04
| * git-merge documentation: describe how conflict is presentedJunio C Hamano2008-08-31
* | git-merge documentation: more details about resolving conflictsDan Hensgen2008-08-22
|/
* Make the DESCRIPTION match <x>... items in the SYNOPSISAbhijit Menon-Sen2008-07-30
* Update my e-mail addressJunio C Hamano2008-07-21
* Documentation/git-merge.txt: Partial rewrite of How Merge WorksPetr Baudis2008-07-19
* Documentation: mention ORIG_HEAD in am, merge, and rebaseBrian Gernhardt2008-07-08
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-05
* Documentation formatting and cleanupJonathan Nieder2008-07-01
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-01
* documentation: move git(7) to git(1)Christian Couder2008-06-06
* merge, pull: introduce '--(no-)stat' optionSZEDER Gábor2008-04-12
* doc: moved merge.* config variables into separate merge-config.txtSZEDER Gábor2008-04-12
* Fix incorrect wording in git-merge.txt.Matthieu Moy2008-03-03
* Documentation: fix and clarify grammar in git-merge docs.Dave Peticolas2008-01-16
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-06
* Documentation: describe 'union' low-level merge driverJunio C Hamano2007-12-22
* Merge branch 'maint' into HEADJunio C Hamano2007-10-30
|\
| * git-merge: document but discourage the historical syntaxJunio C Hamano2007-10-30
* | Merge branch 'lh/merge'Junio C Hamano2007-10-03
|\ \ | |/ |/|
| * git-merge: add support for branch.<name>.mergeoptionsLars Hjemli2007-09-23
* | Fix spelling of overridden in documentationShawn Bohrer2007-09-25
|/
* Try to be consistent with capitalization in the documentationSteve Hoelzer2007-08-01
* Update git-merge documentation.Jakub Narebski2007-07-12
* War on whitespaceJunio C Hamano2007-06-07
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-24
* Convert update-index references in docs to add.Shawn O. Pearce2007-02-17
* git merge documentation: -m is optionalMatthias Lederhofer2007-02-12
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-18
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-28
* git-merge: make it usable as the first class UIJunio C Hamano2006-11-21
* Assorted typo fixesPavel Roskin2006-07-09
* Examples of resetting.Junio C Hamano2005-12-16
* git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano2005-12-02
* Documentation: Describe merge operation a bit better.Junio C Hamano2005-11-28
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-06
* Refactor merge strategies into separate includable file.Jon Loeliger2005-11-06
* Documentation: git-fetch/pull updates.Junio C Hamano2005-11-05
* Documentation: -merge and -pull: describe merge strategies.Junio C Hamano2005-11-04
* Documentation for git-fmt-merge-msgPetr Baudis2005-11-01
* Remove the version tags from the manpagesJunio C Hamano2005-10-10
* [PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov2005-09-20
* 'git-merge': Documentation.Junio C Hamano2005-09-10
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-30 21:03:58 +0000