summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
Commit message (Collapse)AuthorAgeFilesLines
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-181-1/+1
| | | | | | | Also reorders a handful entries to make each list sorted alphabetically. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano2006-12-171-2/+2
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-merge-fileJohannes Schindelin2006-12-161-0/+92
Most of this is derived from the documentation of RCS merge. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>