mirror of
https://git.proxmox.com/git/libgit2
synced 2025-11-04 07:09:14 +00:00
2270ca9f8f
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> |
||
|---|---|---|
| .. | ||
| .gitted | ||
| my-submodule@efad0b11c4 | ||
| .gitmodules | ||
| asparagus.txt | ||
| beef.txt | ||
| bouilli.txt | ||
| gravy.txt | ||
| oyster.txt | ||
| veal.txt | ||