def func(parser, options, args):
"""Show the tree status
"""
args = git.ls_files(args)
directory.cd_to_topdir()
if options.reset:
directory.log = True
if args:
conflicts = git.get_conflicts()
git.resolved([fn for fn in args if fn in conflicts])
git.reset(args)
else:
resolved_all()
git.reset()
else:
status(args, options.modified, options.new, options.deleted,
options.conflict, options.unknown, options.noexclude)
def resolved_all(reset=None):
conflicts = git.get_conflicts()
git.resolved(conflicts, reset)