Age | Commit message (Expand) | Author | Files | Lines |
2015-10-29 | merge-file: clamp exit code to maximum 127 | Jeff King | 1 | -1/+2 |
2013-08-09 | Documentation/git-merge-file: document option "--diff3" | Ralf Thielow | 1 | -1/+4 |
2011-08-04 | docs: put listed example commands in backticks | Jeff King | 1 | -2/+2 |
2011-03-11 | doc: drop author/documentation sections from most pages | Jeff King | 1 | -11/+0 |
2010-03-02 | merge-file: add option to select union merge favor | Bert Wesarg | 1 | -6/+7 |
2010-03-02 | merge-file: add option to specify the marker size | Bert Wesarg | 1 | -2/+3 |
2010-01-20 | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 1 | -2/+10 |
2010-01-10 | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 1 | -5/+5 |
2009-11-29 | git-merge-file --ours, --theirs | Junio C Hamano | 1 | -2/+10 |
2008-12-09 | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 1 | -6/+6 |
2008-07-05 | manpages: italicize nongit command names (if they are in teletype font) | Jonathan Nieder | 1 | -2/+2 |
2008-07-05 | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 1 | -5/+5 |
2008-07-05 | manpages: italicize command names | Jonathan Nieder | 1 | -1/+1 |
2008-07-01 | Documentation formatting and cleanup | Jonathan Nieder | 1 | -5/+5 |
2008-07-01 | Documentation: be consistent about "git-" versus "git " | Jonathan Nieder | 1 | -2/+2 |
2008-06-06 | documentation: move git(7) to git(1) | Christian Couder | 1 | -1/+1 |
2008-01-06 | Documentation: rename gitlink macro to linkgit | Dan McGee | 1 | -2/+2 |
2007-01-18 | Documentation: sync git.txt command list and manual page title | Junio C Hamano | 1 | -1/+1 |
2006-12-17 | Fix mis-mark-up in git-merge-file.txt documentation | Junio C Hamano | 1 | -2/+2 |
2006-12-16 | Document git-merge-file | Johannes Schindelin | 1 | -0/+92 |