summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
Commit message (Expand)AuthorAgeFilesLines
* War on whitespaceJunio C Hamano2007-06-071-1/+1
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-241-1/+1
* Convert update-index references in docs to add.Shawn O. Pearce2007-02-171-1/+1
* git merge documentation: -m is optionalMatthias Lederhofer2007-02-121-1/+1
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-181-1/+1
* Use GIT_REFLOG_ACTION environment variable instead.Shawn O. Pearce2006-12-281-6/+0
* git-merge: make it usable as the first class UIJunio C Hamano2006-11-211-5/+13
* Assorted typo fixesPavel Roskin2006-07-091-1/+1
* Examples of resetting.Junio C Hamano2005-12-161-0/+5
* git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano2005-12-021-4/+6
* Documentation: Describe merge operation a bit better.Junio C Hamano2005-11-281-0/+95
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-061-1/+1
* Refactor merge strategies into separate includable file.Jon Loeliger2005-11-061-0/+2
* Documentation: git-fetch/pull updates.Junio C Hamano2005-11-051-1/+1
* Documentation: -merge and -pull: describe merge strategies.Junio C Hamano2005-11-041-9/+2
* Documentation for git-fmt-merge-msgPetr Baudis2005-11-011-0/+10
* Remove the version tags from the manpagesJunio C Hamano2005-10-101-1/+0
* [PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov2005-09-201-1/+1
* 'git-merge': Documentation.Junio C Hamano2005-09-101-0/+52
View Lorry Controller Status