| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | mergetool: honor mergetool.$tool.trustExitCode for built-in tools | David Aguilar | 2016-11-29 |
| * | mergetools/p4merge: create a base if none available | Kevin Bracey | 2013-03-13 |
| * | mergetools/p4merge: swap LOCAL and REMOTE | Kevin Bracey | 2013-03-13 |
| * | p4merge: fix printf usage | David Aguilar | 2013-02-10 |
| * | mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder | David Aguilar | 2012-12-26 |
| * | mergetools/p4merge: Handle "/dev/null" | David Aguilar | 2012-10-11 |
| * | mergetool--lib: Refactor tools into separate files | David Aguilar | 2011-08-19 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |