| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | mergetool: Use args as pathspec to unmerged files | Jonathon Mah | 2011-09-26 |
| * | mergetool: Teach about submodules | Jonathon Mah | 2011-04-13 |
| * | mergetool: don't skip modify/remove conflicts | Martin von Zweigbergk | 2011-02-16 |
| * | tests: add missing && | Jonathan Nieder | 2010-11-09 |
| * | t7610: cd inside subshell instead of around | Brian Gernhardt | 2010-08-24 |
| * | mergetool: Skip autoresolved paths | David Aguilar | 2010-08-17 |
| * | mergetool: fix running mergetool in sub-directories | Charles Bailey | 2009-01-31 |
| * | mergetool: Add a test for running mergetool in a sub-directory | Charles Bailey | 2009-01-31 |
| * | mergetool: respect autocrlf by using checkout-index | Charles Bailey | 2009-01-27 |
| * | tests: use "git xyzzy" form (t7200 - t9001) | Nanako Shiraishi | 2008-09-03 |
| * | t/: Use "test_must_fail git" instead of "! git" | Stephan Beyer | 2008-07-13 |
| * | Fix executable bits in t/ scripts | Junio C Hamano | 2008-07-04 |
| * | Add a very basic test script for git mergetool | Charles Bailey | 2008-03-05 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |