~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add the 'autobcc' config option
[stgit]
/
stgit
/
commands
/
status.py
diff --git
a/stgit/commands/status.py
b/stgit/commands/status.py
index
4283df8
..
b8f0623
100644
(file)
--- a/
stgit/commands/status.py
+++ b/
stgit/commands/status.py
@@
-67,7
+67,13
@@
def func(parser, options, args):
"""Show the tree status
"""
if options.reset:
"""Show the tree status
"""
if options.reset:
- git.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)
else:
git.status(args, options.modified, options.new, options.deleted,
options.conflict, options.unknown, options.noexclude)