aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
Commit message (Expand)AuthorAge
* Documentation/git-merge-file: document option "--diff3"Ralf Thielow2013-08-09
* docs: put listed example commands in backticksJeff King2011-08-04
* doc: drop author/documentation sections from most pagesJeff King2011-03-11
* merge-file: add option to select union merge favorBert Wesarg2010-03-02
* merge-file: add option to specify the marker sizeBert Wesarg2010-03-02
* Merge branch 'ap/merge-backend-opts'Junio C Hamano2010-01-20
|\
| * git-merge-file --ours, --theirsJunio C Hamano2009-11-29
* | Documentation: spell 'git cmd' without dash throughoutThomas Rast2010-01-10
|/
* Improve language in git-merge.txt and related docsRalf Wildenhues2008-12-09
* manpages: italicize nongit command names (if they are in teletype font)Jonathan Nieder2008-07-05
* manpages: italicize git command names (which were in teletype font)Jonathan Nieder2008-07-05
* manpages: italicize command namesJonathan Nieder2008-07-05
* Documentation formatting and cleanupJonathan Nieder2008-07-01
* Documentation: be consistent about "git-" versus "git "Jonathan Nieder2008-07-01
* documentation: move git(7) to git(1)Christian Couder2008-06-06
* Documentation: rename gitlink macro to linkgitDan McGee2008-01-06
* Documentation: sync git.txt command list and manual page titleJunio C Hamano2007-01-18
* Fix mis-mark-up in git-merge-file.txt documentationJunio C Hamano2006-12-17
* Document git-merge-fileJohannes Schindelin2006-12-16
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-05 06:21:01 +0000