Age | Commit message (Expand) | Author | Files | Lines |
---|---|---|---|---|
2010-12-16 | difftool: provide basename to external tools | Michael J Gruber | 1 | -0/+1 |
2010-12-16 | git-difftool.txt: correct the description of $BASE and describe $MERGED | Michael J Gruber | 1 | -2/+3 |
2010-01-20 | Merge remote branch 'remotes/trast-doc/for-next' | Junio C Hamano | 1 | -8/+8 |
2010-01-15 | difftool: Add '-x' and as an alias for '--extcmd' | David Aguilar | 1 | -1/+2 |
2010-01-10 | Documentation: spell 'git cmd' without dash throughout | Thomas Rast | 1 | -8/+8 |
2010-01-09 | difftool: Allow specifying unconfigured commands with --extcmd | David Aguilar | 1 | -0/+5 |
2010-01-03 | git-difftool: Add '--gui' for selecting a GUI tool | David Aguilar | 1 | -0/+9 |
2009-10-28 | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | 1 | -1/+1 |
2009-05-24 | mergetool--lib: add support for araxis merge | David Aguilar | 1 | -1/+1 |
2009-04-07 | difftool: add support for a difftool.prompt config variable | David Aguilar | 1 | -1/+9 |
2009-04-07 | difftool: move 'git-difftool' out of contrib | David Aguilar | 1 | -0/+97 |