Github some questions about working with branches?

Question

git

Greetings Toaster Members!
It's easier to show my problem in the pictures:
1) I make two subsequent commits in the master branch:

2) Then I create the foo branch, switch to it, make a commit:

3) I make another commit in the foo branch:

Then I need to make changes that don’t fit in any way , for aesthetic reasons, in the foo branch, and you need to commit them in the master branch.
4) I switch to the master branch and make a commit:

And here is the question itself: is the course of my thoughts on the previous screen correct, should the tree be like this?
If so, then I need the latest changes made to the foo branch too.
Simply put, you need to shift the origin of the foo branch to the 5th commit of the master branch, like this:

Answer 1

And here is the question itself: on the previous screen, is the course of my thoughts correct, should the tree be like this?

Yes.
git rebase master foo

Answer 2

hello graffiti artists!
instead of smearing paper, scanning and attaching to the question, you could simply refer to the documentation: https://git-scm.com/book/en/v2