summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
Commit message (Expand)AuthorAgeFilesLines
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-061-2/+2
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-181-1/+1
* Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano2006-12-171-2/+2
* Document git-merge-fileJohannes Schindelin2006-12-161-0/+92