summaryrefslogtreecommitdiff
path: root/tests/resources/rebase-submodule
Commit message (Collapse)AuthorAgeFilesLines
* tests: fix the rebase-submodule testEtienne Samson2017-07-251-0/+0
|
* Remove invalid submoduleEtienne Samson2017-07-201-0/+0
| | | Fixes #4274
* rebase: ignore untracked files in submodulesDavid Turner2017-03-0332-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>