| Commit message (Expand) | Author | Age | |
|---|---|---|---|
| * | submodule: Search for merges only at end of recursive merge | Brad King | 2011-10-13 |
| * | submodule: Demonstrate known breakage during recursive merge | Brad King | 2011-10-13 |
| * | submodule: process conflicting submodules only once | Nicolas Morey-Chaisemartin | 2011-03-30 |
| * | t7405: cd inside subshell instead of around | Jens Lehmann | 2010-09-03 |
| * | Implement automatic fast-forward merge for submodules | Heiko Voigt | 2010-07-07 |
| * | add missing && to submodule-merge testcase | Heiko Voigt | 2010-07-06 |
| * | 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 |