porters-handbook: Fix the Git process in Chapter 11.1

[ygy]

Summary

In Chapter 11.1 Using Git to Make Patches, there are multiple issues with the process:

• git pull --rebase will refuse to work if there are any staged or unstaged changes, so the users are unable to update the repo to the latest.
• git diff does not work for staged changes, need to add --staged.

This commit attempts to address the above.

PR: 256122
Reported by: Neal Nelson <[e-mail]>

[bcr]

A textual suggestion, the rest looks fine.

documentation/content/en/books/porters-handbook/upgrading/_index.adoc

112

How about splitting the "Watch and follow the output carefully" part into a separate sentence to give it more emphasis and reducing the length of the following sentence a bit?

[pauamma_gundo.com]

documentation/content/en/books/porters-handbook/upgrading/_index.adoc

112

Second that. It also gets rid of a comma splice.</pedant>

[ygy]

Address @bcr's comment

[pauamma_gundo.com]

documentation/content/en/books/porters-handbook/upgrading/_index.adoc

39

s/you/your/ (or use "the" instead, since IIRC the doc style guide discourages 2nd-person pronouns).

[ygy]

Address pauamma's comment

[imp]

Personally, I've used this workflow in the past, and it's dangerous.
I think we should instead be strongly encouraging people to commit the changes before updating.
git rebase -i will let them curate them to committable form
If anything at all goes wrong in the above, there's no 'reset and do it again' like there is with a git rebase -i gone wrong: you can simply start over with git rebase --abort. With the above, if you screw anything up in the rebase, you can lose cahnges.