aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2006-07-09Assorted typo fixesPavel Roskin1-1/+1
2005-12-16Examples of resetting.Junio C Hamano1-0/+5
2005-12-02git-merge documentation: conflicting merge leaves higher stages in indexJunio C Hamano1-4/+6
2005-11-28Documentation: Describe merge operation a bit better.Junio C Hamano1-0/+95
2005-11-06Refactored merge options into separate merge-options.txt.Jon Loeliger1-1/+1
2005-11-06Refactor merge strategies into separate includable file.Jon Loeliger1-0/+2
2005-11-05Documentation: git-fetch/pull updates.Junio C Hamano1-1/+1
2005-11-04Documentation: -merge and -pull: describe merge strategies.Junio C Hamano1-9/+2
2005-11-01Documentation for git-fmt-merge-msgPetr Baudis1-0/+10
2005-10-10Remove the version tags from the manpagesJunio C Hamano1-1/+0
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroSergey Vlasov1-1/+1
2005-09-10'git-merge': Documentation.Junio C Hamano1-0/+52