Merge branch 'aa/add-p-previous-decisions'

"git add -p" and friends note what the current status of the hunk being shown is. * aa/add-p-previous-decisions: add -p: show user's hunk decision when selecting hunks