summaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.txt (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-071-4/+4
* Documentation: describe 'union' low-level merge driverJunio C Hamano2007-12-231-1/+2
* Merge branch 'maint' into HEADJunio C Hamano2007-10-311-5/+6
|\
| * git-merge: document but discourage the historical syntaxJunio C Hamano2007-10-311-5/+6
* | Merge branch 'lh/merge'Junio C Hamano2007-10-031-0/+4
|\ \ | |/ |/|
| * git-merge: add support for branch.<name>.mergeoptionsLars Hjemli2007-09-241-0/+4
* | Fix spelling of overridden in documentationShawn Bohrer2007-09-261-1/+1
|/
* Try to be consistent with capitalization in the documentationSteve Hoelzer2007-08-021-5/+5
* Update git-merge documentation.Jakub Narebski2007-07-131-0/+15
* War on whitespaceJunio C Hamano2007-06-071-1/+1
* Add a configuration option to control diffstat after mergeAlex Riesen2007-05-251-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-131-1/+1
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-191-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-221-5/+13
* Assorted typo fixesPavel Roskin2006-07-091-1/+1
* Examples of resetting.Junio C Hamano2005-12-171-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-291-0/+95
* Refactored merge options into separate merge-options.txt.Jon Loeliger2005-11-071-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-211-1/+1
* 'git-merge': Documentation.Junio C Hamano2005-09-111-0/+52
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 15:27:03 +0100