summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
Commit message (Expand)AuthorAgeFilesLines
* Documentation/git-merge-file: document option "--diff3"rt/doc-merge-file-diff3Ralf Thielow2013-08-091-1/+4
* docs: put listed example commands in backticksJeff King2011-08-041-2/+2
* doc: drop author/documentation sections from most pagesJeff King2011-03-111-11/+0
* merge-file: add option to select union merge favorBert Wesarg2010-03-021-6/+7
* merge-file: add option to specify the marker sizeBert Wesarg2010-03-021-2/+3
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-201-2/+10
|\
| * git-merge-file --ours, --theirsJunio C Hamano2009-11-291-2/+10
* | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-101-5/+5
|/
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-091-6/+6
* manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder2008-07-051-2/+2
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-051-5/+5
* manpages: italicize command namesJonathan Nieder2008-07-051-1/+1
* Documentation formatting and cleanupJonathan Nieder2008-07-011-5/+5
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-011-2/+2
* documentation: move git(7) to git(1)Christian Couder2008-06-061-1/+1
* 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
View Lorry Controller Status