| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | merge-recursive: do not die on a conflicting submodule | Junio C Hamano | 2009-04-29 | 1 | -3/+3 |
| * | update cache for conflicting submodule entries | Clemens Buchacher | 2009-04-05 | 1 | -1/+1 |
| * | add tests for merging with submodules | Clemens Buchacher | 2009-04-05 | 1 | -0/+74 |
 |
index : delta/git.git | |
| github.com: git/git.git |
| summaryrefslogtreecommitdiff |