| Age | Commit message (Expand) | Author | Files | Lines |
|---|---|---|---|---|
| 2010-07-06 | add missing && to submodule-merge testcase |  Heiko Voigt | 1 | -1/+1 |
| 2009-04-29 | merge-recursive: do not die on a conflicting submodule |  Junio C Hamano | 1 | -3/+3 |
| 2009-04-05 | update cache for conflicting submodule entries |  Clemens Buchacher | 1 | -1/+1 |
| 2009-04-05 | add tests for merging with submodules | Clemens Buchacher | 1 | -0/+74 |
 |
index : tgif.git | |
| Terin's Improved Git Fork | terinjokes@gmail.com |
| summaryrefslogtreecommitdiff |