Re: [PATCH v2 7/7] t5520: test --[no-]autostash with pull.rebase=true

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain wrote: > "--[no-]autostash" option for git-pull is only valid in rebase mode( s/"--[no-]autostash"/The --[no-]autostash/ Also, move the '(' from the end of the line to the beginning of the next line. > i.e. either --rebase

[PATCH v2 7/7] t5520: test --[no-]autostash with pull.rebase=true

2016-04-02 Thread Mehul Jain
"--[no-]autostash" option for git-pull is only valid in rebase mode( i.e. either --rebase should be used or pull.rebase=true). Existing tests already check the cases when --rebase is used but fails to check for pull.rebase=true case. Add two new tests to check that --[no-]autostash option works