| Commit message (Expand) | Author | Age |
* | merge-file: add option to select union merge favor | Bert Wesarg | 2010-03-02 |
* | merge-file: add option to specify the marker size | Bert Wesarg | 2010-03-02 |
* | Merge branch 'ap/merge-backend-opts' | Junio C Hamano | 2010-01-20 |
|\ |
|
| * | git-merge-file --ours, --theirs | Junio C Hamano | 2009-11-29 |
* | | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 |
|/ |
|
* | Improve language in git-merge.txt and related docs | Ralf Wildenhues | 2008-12-09 |
* | manpages: italicize nongit command names (if they are in teletype font) | Jonathan Nieder | 2008-07-05 |
* | manpages: italicize git command names (which were in teletype font) | Jonathan Nieder | 2008-07-05 |
* | manpages: italicize command names | Jonathan Nieder | 2008-07-05 |
* | Documentation formatting and cleanup | Jonathan Nieder | 2008-07-01 |
* | Documentation: be consistent about "git-" versus "git " | Jonathan Nieder | 2008-07-01 |
* | documentation: move git(7) to git(1) | Christian Couder | 2008-06-06 |
* | Documentation: rename gitlink macro to linkgit | Dan McGee | 2008-01-06 |
* | Documentation: sync git.txt command list and manual page title | Junio C Hamano | 2007-01-18 |
* | Fix mis-mark-up in git-merge-file.txt documentation | Junio C Hamano | 2006-12-17 |
* | Document git-merge-file | Johannes Schindelin | 2006-12-16 |