aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
Commit message (Expand)AuthorAge
* 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-08-01 22:03:56 +0000