path: root/Documentation/git-merge-file.txt
AgeCommit message (Expand)Author
2015-10-29merge-file: clamp exit code to maximum 127Jeff King
2013-08-09Documentation/git-merge-file: document option "--diff3"Ralf Thielow
2011-08-04docs: put listed example commands in backticksJeff King
2011-03-11doc: drop author/documentation sections from most pagesJeff King
2010-03-03merge-file: add option to select union merge favorBert Wesarg
2010-03-03merge-file: add option to specify the marker sizeBert Wesarg
2010-01-21Merge branch 'ap/merge-backend-opts'Junio C Hamano
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast
2009-11-30git-merge-file --ours, --theirsJunio C Hamano
2008-12-10Improve language in git-merge.txt and related docsRalf Wildenhues
2008-07-05manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder
2008-07-05manpages: italicize command namesJonathan Nieder
2008-07-02Documentation formatting and cleanupJonathan Nieder
2008-07-02Documentation: be consistent about "git-" versus "git "Jonathan Nieder
2008-06-06documentation: move git(7) to git(1)Christian Couder
2008-01-07Documentation: rename gitlink macro to linkgitDan McGee
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano
2006-12-17Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano
2006-12-16Document git-merge-fileJohannes Schindelin