Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 2010-01-20 |
|\ | |||
| * | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 2010-01-10 |
* | | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 2010-01-15 |
* | | difftool: Allow specifying unconfigured commands with --extcmd | David Aguilar | 2010-01-09 |
* | | git-difftool: Add '--gui' for selecting a GUI tool | David Aguilar | 2010-01-03 |
|/ | |||
* | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 2009-10-28 |
* | mergetool--lib: add support for araxis merge | David Aguilar | 2009-05-24 |
* | difftool: add support for a difftool.prompt config variable | David Aguilar | 2009-04-07 |
* | difftool: move 'git-difftool' out of contrib | David Aguilar | 2009-04-07 |