When should I use git pull --rebase instead of git pull?

Question

I have a local commit [A] and a branch which points at commit [B]. I need to pull changes before pushing the commit.

Scenario 1:

Changes of commit [A] do not affect anything changed on commit [B]

git pull should be fine, pull should not overwrite anything. Same for using git pull --rebase.

Scenario 2:

Changes of commit [A] and commit [B] affect the same file

git pull should be fine, git should automerge everything. Same for using git pull --rebase.

Scenario 3:

Changes (or deletions) of commit [A] and commit [B] affect the lines of code.

git pull results into merge conflicts which I need to remove manually. Same for using git pull --rebase.

Am I wrong? In which cases I need to use git pull --rebase ? If you pull changes you need to rebase the commit anyway, either by auto merge, no merge or solving merge conflicts.

stackoverflow.com/questions/2472254/…

phd
– phd

2019-01-02 20:37:48 +00:00
Commented Jan 2, 2019 at 20:37 — phd
– phd, Commented Jan 2, 2019 at 20:37
stackoverflow.com/questions/18930527/…

phd
– phd

2019-01-02 20:38:21 +00:00
Commented Jan 2, 2019 at 20:38 — phd
– phd, Commented Jan 2, 2019 at 20:38
stackoverflow.com/…

phd
– phd

2019-01-02 20:38:26 +00:00
Commented Jan 2, 2019 at 20:38 — phd
– phd, Commented Jan 2, 2019 at 20:38
I almost got it, could you post at least one more?

elp
– elp

2019-01-02 21:31:33 +00:00
Commented Jan 2, 2019 at 21:31 — elp
– elp, Commented Jan 2, 2019 at 21:31

Schleis · Accepted Answer · 2019-01-02 20:15:58Z

1

You can use git pull --rebase in all three cases. However, in the scenarios 2 and 3, you will have a new merge commit. The message will say that you are merging Branch 'foo' into branch 'foo' and with branches that have a lot of changes can make the history really confusing. Using git pull --rebase will not have these merge commits and will show a fairly straight forward history in the git log.

answered Jan 2, 2019 at 20:15

Schleis

44.2k8 gold badges73 silver badges90 bronze badges

Sign up to request clarification or add additional context in comments.

Collectives™ on Stack Overflow

When should I use git pull --rebase instead of git pull?

1 Answer 1

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

1 Answer 1

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related