stgit: Show diffstat in patches if 'magit-show-diffstat' is enabled
stgit: Set check optional args with 'and' instead of 'with'
Merge pull request #1170 from llvilanova/stgit-diffstat

stgit: Show diffstat in patches if 'magit-show-diffstat' is enabled