X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/4d4c0e3a5cf0930619317b473259177bc5b79f41..539fb2921209bd3fd6165baa057f76f474aa5cb4:/stgit/commands/status.py

diff --git a/stgit/commands/status.py b/stgit/commands/status.py
index c0b1a8e..b8f0623 100644
--- a/stgit/commands/status.py
+++ b/stgit/commands/status.py
@@ -57,11 +57,23 @@ options = [make_option('-m', '--modified',
                        action = 'store_true'),
            make_option('-x', '--noexclude',
                        help = 'do not exclude any files from listing',
+                       action = 'store_true'),
+           make_option('--reset',
+                       help = 'reset the current tree changes',
                        action = 'store_true')]
 
 
 def func(parser, options, args):
     """Show the tree status
     """
-    git.status(args, options.modified, options.new, options.deleted,
-               options.conflict, options.unknown, options.noexclude)
+    if options.reset:
+        if args:
+            for f in args:
+                resolved(f)
+            git.reset(args)
+        else:
+            resolved_all()
+            git.reset()
+    else:
+        git.status(args, options.modified, options.new, options.deleted,
+                   options.conflict, options.unknown, options.noexclude)