Staging from diffs
Stage all hunks matching the pattern stub: .+
:
git diff -U0 \
| grepdiff -E 'stub: .+' --output-matching hunk \
| git apply --cached --unidiff-zero
Stage all renames:
git status --porcelain \
| awk '/^ R { print $2"\n"$4 }' \
| xargs git add