Re: [PATCH v1 2/2] Ignore dirty submodule states during stash

2016-05-16 Thread Eric Sunshine
On Mon, May 16, 2016 at 11:40 PM, Vasily Titskiy wrote: > It checks if 'stash pop' does not trigger merge conflics > in submodules. Missing sign-off. Also, it would be best to combine these two patches so that the fix and patch reside in a single patch. More below... > --- > diff --git a/t/t39

Re: [PATCH v1 2/2] Ignore dirty submodule states during stash

2016-05-16 Thread Vasily Titskiy
It checks if 'stash pop' does not trigger merge conflics in submodules. --- t/t3903-stash.sh | 35 +++ 1 file changed, 35 insertions(+) diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh index 2142c1f..e48a5b5 100755 --- a/t/t3903-stash.sh +++ b/t/t3903-stash.sh @@ -