summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
AgeCommit message (Expand)AuthorFilesLines
2011-08-04docs: put listed example commands in backticksLibravatar Jeff King1-2/+2
2011-03-11doc: drop author/documentation sections from most pagesLibravatar Jeff King1-11/+0
2010-03-02merge-file: add option to select union merge favorLibravatar Bert Wesarg1-6/+7
2010-03-02merge-file: add option to specify the marker sizeLibravatar Bert Wesarg1-2/+3
2010-01-20Merge branch 'ap/merge-backend-opts'Libravatar Junio C Hamano1-2/+10
2010-01-10Documentation: spell 'git cmd' without dash throughoutLibravatar Thomas Rast1-5/+5
2009-11-29git-merge-file --ours, --theirsLibravatar Junio C Hamano1-2/+10
2008-12-09Improve language in git-merge.txt and related docsLibravatar Ralf Wildenhues1-6/+6
2008-07-05manpages: italicize nongit command names (if they are in teletype font)Libravatar Jonathan Nieder1-2/+2
2008-07-05manpages: italicize git command names (which were in teletype font)Libravatar Jonathan Nieder1-5/+5
2008-07-05manpages: italicize command namesLibravatar Jonathan Nieder1-1/+1
2008-07-01Documentation formatting and cleanupLibravatar Jonathan Nieder1-5/+5
2008-07-01Documentation: be consistent about "git-" versus "git "Libravatar Jonathan Nieder1-2/+2
2008-06-06documentation: move git(7) to git(1)Libravatar Christian Couder1-1/+1
2008-01-06Documentation: rename gitlink macro to linkgitLibravatar Dan McGee1-2/+2
2007-01-18Documentation: sync git.txt command list and manual page titleLibravatar Junio C Hamano1-1/+1
2006-12-17Fix mis-mark-up in git-merge-file.txt documentationLibravatar Junio C Hamano1-2/+2
2006-12-16Document git-merge-fileLibravatar Johannes Schindelin1-0/+92
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 04:34:39 +0000