delta/libgit2.git/tests/resources/rebase-submodule, branch ethomson/test_https github.com: libgit2/libgit2.git tests: fix the rebase-submodule test 2017-07-25T18:38:44+00:00 Etienne Samson samson.etienne@gmail.com 2017-07-20T21:00:15+00:00 35cb7b840d54030efdb22a0a908dd6acfd247aa7 






Remove invalid submodule
2017-07-20T21:00:15+00:00

Etienne Samson
samson.etienne@gmail.com

2017-06-21T12:57:30+00:00

45994fdcb0fab813b4bc8a9af3edc312f8727794

Fixes #4274




Fixes #4274






rebase: ignore untracked files in submodules
2017-03-03T20:07:54+00:00

David Turner
dturner@twosigma.com

2017-03-03T18:27:47+00:00

2270ca9f8feecf93fe39a02a6fbde90a22c1a665

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>





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>