'status --reset' should remove the conflicts as well

[stgit] / stgit / commands / status.py

diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index 4283df8..bd3edfb 100644 (file)
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -67,6 +67,7 @@ def func(parser, options, args):
     """Show the tree status
     """
     if options.reset:
+        resolved_all()
         git.reset()
     else:
         git.status(args, options.modified, options.new, options.deleted,