summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
AgeCommit message (Expand)AuthorFilesLines
2005-11-05Documentation: git-fetch/pull updates.Libravatar Junio C Hamano1-1/+1
2005-11-04Documentation: -merge and -pull: describe merge strategies.Libravatar Junio C Hamano1-9/+2
2005-11-01Documentation for git-fmt-merge-msgLibravatar Petr Baudis1-0/+10
2005-10-10Remove the version tags from the manpagesLibravatar Junio C Hamano1-1/+0
2005-09-20[PATCH] Documentation: Update all files to use the new gitlink: macroLibravatar Sergey Vlasov1-1/+1
2005-09-10'git-merge': Documentation.Libravatar Junio C Hamano1-0/+52