| Commit message (Expand) | Author | Age | Files | Lines |
* | documentation: trivial style cleanups | Felipe Contreras | 2013-05-17 | 1 | -2/+1 |
* | difftool --dir-diff: symlink all files matching the working tree | John Keeping | 2013-03-14 | 1 | -1/+3 |
* | git-difftool(1): fix formatting of --symlink description | John Keeping | 2013-03-14 | 1 | -2/+2 |
* | Documentation: the name of the system is 'Git', not 'git' | Thomas Ackermann | 2013-02-01 | 1 | -1/+1 |
* | mergetool,difftool: Document --tool-help consistently | David Aguilar | 2012-08-10 | 1 | -3/+3 |
* | difftool: Use symlinks when diffing against the worktree | David Aguilar | 2012-07-23 | 1 | -0/+8 |
* | difftool: print list of valid tools with '--tool-help' | Tim Henigan | 2012-04-23 | 1 | -5/+6 |
* | difftool: teach difftool to handle directory diffs | Tim Henigan | 2012-04-23 | 1 | -0/+6 |
* | Documentation/difftool: add deltawalker to list of valid diff toolsth/mergetools-deltawalker | Tim Henigan | 2012-03-15 | 1 | -2/+3 |
* | documentation fix: git difftool uses diff tools, not merge tools. | Thomas Hochstein | 2011-11-21 | 1 | -1/+1 |
* | Documentation: use [verse] for SYNOPSIS sections | Martin von Zweigbergk | 2011-07-06 | 1 | -0/+1 |
* | Merge branch 'ss/mergetool--lib' | Junio C Hamano | 2011-03-19 | 1 | -2/+2 |
|\ |
|
| * | mergetool--lib: Add Beyond Compare 3 as a tool | Sebastian Schuberth | 2011-02-28 | 1 | -1/+1 |
| * | mergetool--lib: Sort tools alphabetically for easier lookup | Sebastian Schuberth | 2011-02-28 | 1 | -2/+2 |
* | | doc: drop author/documentation sections from most pages | Jeff King | 2011-03-11 | 1 | -9/+0 |
|/ |
|
* | Merge branch 'maint' | Junio C Hamano | 2010-12-16 | 1 | -2/+4 |
|\ |
|
| * | difftool: provide basename to external tools | Michael J Gruber | 2010-12-16 | 1 | -0/+1 |
| * | git-difftool.txt: correct the description of $BASE and describe $MERGED | Michael J Gruber | 2010-12-16 | 1 | -2/+3 |
* | | docs: clarify git diff modes of operation | Jeff King | 2010-11-05 | 1 | -1/+2 |
* | | diff,difftool: Don't use the {0,2} notation in usage strings | Štěpán Němec | 2010-11-05 | 1 | -1/+1 |
|/ |
|
* | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 | 1 | -8/+8 |
|\ |
|
| * | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 | 1 | -8/+8 |
* | | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 2010-01-15 | 1 | -1/+2 |
* | | difftool: Allow specifying unconfigured commands with --extcmd | David Aguilar | 2010-01-09 | 1 | -0/+5 |
* | | git-difftool: Add '--gui' for selecting a GUI tool | David Aguilar | 2010-01-03 | 1 | -0/+9 |
|/ |
|
* | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 2009-10-28 | 1 | -1/+1 |
* | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 | 1 | -1/+1 |
* | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 | 1 | -1/+9 |
* | difftool: move 'git-difftool' out of contrib | David Aguilar | 2009-04-07 | 1 | -0/+97 |