Merge branch 'am/status'

* am/status: wt-status: Teach how to discard changes in the working directory wt-status: Split header generation into three functions