Tag

  • Show log

    Commit

  • Hash : 2270ca9f
    Author : David Turner
    Date : 2017-03-03T13:27:47

    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>