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