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