| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | merge-recursive: do not die on a conflicting submodule | Junio C Hamano | 2009-04-29 |
| * | update cache for conflicting submodule entries | Clemens Buchacher | 2009-04-05 |
| * | add tests for merging with submodules | Clemens Buchacher | 2009-04-05 |
 |
index : org/kernel/git.git | |
| forked from git/git | git |
| aboutsummaryrefslogtreecommitdiff |