~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make 'push --undo' safer
[stgit]
/
stgit
/
commands
/
status.py
diff --git
a/stgit/commands/status.py
b/stgit/commands/status.py
index
15fbcf3
..
b8f0623
100644
(file)
--- a/
stgit/commands/status.py
+++ b/
stgit/commands/status.py
@@
-54,11
+54,26
@@
options = [make_option('-m', '--modified',
action = 'store_true'),
make_option('-u', '--unknown',
help = 'show unknown files only',
action = 'store_true'),
make_option('-u', '--unknown',
help = 'show unknown files only',
+ 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
"""
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)
+ 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)