aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
Commit message (Expand)AuthorAge
* documentation: move git(7) to git(1)Christian Couder2008-06-06
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-06
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-18
* Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano2006-12-17
* Document git-merge-fileJohannes Schindelin2006-12-16