Conflicts:
stgit/commands/files.py
stgit/commands/mail.py
stgit/git.py
rev2 = git_id(crt_series, '%s' % patch)
if options.stat:
- output = gitlib.diffstat(git.diff(rev1 = rev1, rev2 = rev2))
+ output = gitlib.diffstat(git.diff(rev1 = rev1, rev2 = rev2,
+ diff_flags = options.diff_flags))
elif options.bare:
output = git.barefiles(rev1, rev2)
else:
for p in patches),
'diffstat': gitlib.diffstat(git.diff(
rev1 = git_id(crt_series, '%s^' % patches[0]),
- rev2 = git_id(crt_series, '%s' % patches[-1])))}
+ rev2 = git_id(crt_series, '%s' % patches[-1]),
+ diff_flags = options.diff_flags))}
try:
msg_string = tmpl % tmpl_dict