aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git-merge-file.txt
AgeCommit message (Expand)AuthorFilesLines
2023-11-22merge-file: add --diff-algorithm optionAntonin Delpeuch1-0/+6
2023-11-02merge-file: add an option to process object IDsbrian m. carlson1-1/+18
2023-11-02git-merge-file doc: drop "-file" from argument placeholdersMartin Ågren1-10/+11
2021-12-01update documentation for new zdiff3 conflictStyleElijah Newren1-0/+3
2015-10-29merge-file: clamp exit code to maximum 127Jeff King1-1/+2
2013-08-09Documentation/git-merge-file: document option "--diff3"Ralf Thielow1-1/+4
2011-08-04docs: put listed example commands in backticksJeff King1-2/+2
2011-03-11doc: drop author/documentation sections from most pagesJeff King1-11/+0
2010-03-02merge-file: add option to select union merge favorBert Wesarg1-6/+7
2010-03-02merge-file: add option to specify the marker sizeBert Wesarg1-2/+3
2010-01-20Merge branch 'ap/merge-backend-opts'Junio C Hamano1-2/+10
2010-01-10Documentation: spell 'git cmd' without dash throughoutThomas Rast1-5/+5
2009-11-29git-merge-file --ours, --theirsJunio C Hamano1-2/+10
2008-12-09Improve language in git-merge.txt and related docsRalf Wildenhues1-6/+6
2008-07-05manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder1-2/+2
2008-07-05manpages: italicize git command names (which were in teletype font)Jonathan Nieder1-5/+5
2008-07-05manpages: italicize command namesJonathan Nieder1-1/+1
2008-07-01Documentation formatting and cleanupJonathan Nieder1-5/+5
2008-07-01Documentation: be consistent about "git-" versus "git "Jonathan Nieder1-2/+2
2008-06-06documentation: move git(7) to git(1)Christian Couder1-1/+1
2008-01-06Documentation: rename gitlink macro to linkgitDan McGee1-2/+2
2007-01-18Documentation: sync git.txt command list and manual page titleJunio C Hamano1-1/+1
2006-12-17Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano1-2/+2
2006-12-16Document git-merge-fileJohannes Schindelin1-0/+92
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-07 04:22:42 +0000