| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | tests: fix the rebase-submodule test | Etienne Samson | 2017-07-25 | 1 | -0/+0 |
| | | |||||
| * | Remove invalid submodule | Etienne Samson | 2017-07-20 | 1 | -0/+0 |
| | | | | Fixes #4274 | ||||
| * | rebase: ignore untracked files in submodules | David Turner | 2017-03-03 | 32 | -0/+122 |
| An untracked file in a submodule should not prevent a rebase from starting. Even if the submodule's SHA is changed, and that file would conflict with a new tracked file, it's still OK to start the rebase and discover the conflict later. Signed-off-by: David Turner <dturner@twosigma.com> | |||||
