| Age | Commit message (Expand) | Author | Lines |
|---|---|---|---|
| 2010-01-29 | add shebang line to git-mergetool--lib.sh | Jeff King | -0/+1 |
| 2009-11-25 | Merge branch 'rs/work-around-grep-opt-insanity' | Junio C Hamano | -7/+6 |
| 2009-11-23 | mergetool--lib: simplify guess_merge_tool() | René Scharfe | -7/+6 |
| 2009-10-28 | mergetool--lib: add p4merge as a pre-configured mergetool option | Scott Chacon | -2/+15 |
| 2009-05-24 | mergetool--lib: add support for araxis merge | David Aguilar | -2/+23 |
| 2009-05-09 | mergetool--lib: specialize diff options for emerge and ecmerge | David Aguilar | -3/+3 |
| 2009-04-12 | mergetool--lib: simplify API usage by removing more global variables | David Aguilar | -51/+58 |
| 2009-04-08 | difftool/mergetool: refactor commands to use git-mergetool--lib | David Aguilar | -0/+378 |
 |
index : git | |
| Mirror of https://git.kernel.org/pub/scm/git/git.git/ |
| summaryrefslogtreecommitdiffstats |
path: root/git-mergetool--lib.sh