Ything-RepoMirrors/libgit2
2
0
Fork 0
mirror of https://github.com/libgit2/libgit2.git synced 2026-01-25 11:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,101 Commits 119 Branches 117 Tags
main
Commit Graph

3 Commits

Author SHA1 Message Date
Etienne Samson
35cb7b840d tests: fix the rebase-submodule test 2017-07-25 20:38:44 +02:00
Etienne Samson
45994fdcb0 Remove invalid submodule 
Fixes #4274
 2017-07-20 23:00:15 +02:00
David Turner
2270ca9f8f rebase: ignore untracked files in submodules 
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>
 2017-03-03 15:07:54 -05:00