Git push question?

Question

git

From the git book
$ git checkout -b sf origin/serverfix
Branch sf set up to track remote branch refs/remotes/origin/serverfix.
Switched to a new branch "sf"
Your local sf branch will now automatically push and pull changes from origin/serverfix.
uhm, if I make a branch from master
$ git checkout -b sf origin/master
I commit my changes and do
$ git push
then I will upload all this to the master branch on the server ? and grind all the other changes there?

Answer 1

Yes, but what does the grinding of changes have to do with it?

Answer 2

uhm, if I make a branch from master
$ git checkout -b sf origin/master
I commit my changes and do
$ git push
then I will upload all this to the master branch on the server ? and grind all the other changes there?

Why are you overreacting? If you committed on top of the current master, and no one else uploaded anything to the master before your push, your changes will simply be added to the master. If master has changed, you will get an error.

Answer 3

Short answer: no
Long answer:
> git checkout -b sf origin/serverfix
will branch from the serverfix branch on the remote host
> git push
will not send anything, because nothing has been changed on the sf branch
> git push origin master
will push all changes to master if they were made on top of the last commit, or throw an error if sf does not include all of master's commits
> git push --force origin master
will push all changes to master even if there were commits that are not in sf
In order not to overwrite anything in the master before git push, it is better to do
> git fetch origin
> git rebase origin/master
To look at the commit tree, you can use the command:
> git tree = log --oneline --decorate --all --graph