"J. Bruce Fields" [off-list ref] writes:
quoted hunk ↗ jump to hunk
"Force a re-read of everything" doesn't mean much to me.
@@ -38,7 +38,8 @@ OPTIONS
Quiet, supress feedback messages.
-f::
- Force a re-read of everything.
+ Proceed even if the index or the working tree differs
+ from HEAD.
While this is definitely better, I think it still is not clear
why the command needs an option to proceed.
Not proceeding is about preventing local changes from getting
lost, and the option is a way to allow it to overwrite and lose
any local change.
Other than that, and your "From: " line (did you change your
config or switch machines?) on the first three commits, I find
all the changes very sensible.