So instead of:

    local$ git push

    upstream$ git fetch && git merge

    local$ git format-patch

    local: open file picker for attachments.

    upstream: save as ...

    upstream$ git am