thodg/libgit2/tests/resources/rebase-submodule/asparagus.txt
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/asparagus.txt
-
ASPARAGUS SOUP. Take four large bunches of asparagus, scrape it nicely, cut off one inch of the tops, and lay them in water, chop the stalks and put them on the fire with a piece of bacon, a large onion cut up, and pepper and salt; add two quarts of water, boil them till the stalks are quite soft, then pulp them through a sieve, and strain the water to it, which must be put back in the pot; put into it a chicken cut up, with the tops of asparagus which had been laid by, boil it until these last articles are sufficiently done, thicken with flour, butter and milk, and serve it up.