thodg/libgit2/tests/resources/rebase-submodule/gravy.txt

Branch

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/gravy.txt

GRAVY SOUP.

Get eight pounds of coarse lean beef--wash it clean and lay it in your
pot, put in the same ingredients as for the shin soup, with the same
quantity of water, and follow the process directed for that. Strain the
soup through a sieve, and serve it up clear, with nothing more than
toasted bread in it; two table-spoonsful of mushroom catsup will add a
fine flavour to the soup.