summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)Author
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