thodg/libgit2/tests/resources/rebase-submodule/.gitted/config

Tag

Show log
Commit
Hash : 2270ca9f
Author :
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>

tests/resources/rebase-submodule/.gitted/config

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
[branch "asparagus"]
	rebase = true
[branch "master"]
	rebase = true