Merge "Document the behavior of the --force-non-staged flag."