Does anyone know what is the difference? Seems to me, it is the same. But when I run it, it didn't do the same thing:
git rebase origin/branch - ok rebases from remote branch
git rebase origin branch - makes conflicts
Asked
Active
Viewed 1.3e+01k times
3 Answers
72
@Mar's answer is right and perfectly solved this question, just add one comment.
if you want to rebase a branch based on remote master branch, git rebase origin/master is not enough, it will not get new commits directly from origin/master. You need to git fetch before git rebase origin/master.
or you can use another way to rebase a branch.
- switch to master
git checkout master git pull origin master- switch back to your own branch
git checkout {your branch} git rebase origin/master
then, your branch is updated to newest commits.
Alexis Wilke
- 19,179
- 10
- 84
- 156
Xiongmin LIN
- 1,178
- 11
- 9
-
2is there a difference in 4th step with : `git pull origin/master --rebase` ? – medmek Sep 16 '20 at 08:33
-
3Just learned this one but `git checkout {your branch}` can actually be `git checkout -` if the last branch you were on was yours – nerdlyist Dec 03 '21 at 20:57
-
2@nerdlyist the same logic as `cd -`. – thoroc Apr 13 '22 at 09:47
-
@thoroc that is awesome – nerdlyist Apr 13 '22 at 15:08
-
`git checkout {your branch}` -> `git rebase origin/master` -> `git push` I think it does the same thing, am I right? – Georgi Georgiev Dec 16 '22 at 10:35
52
git rebase <upstream> <branch>
is equal to
git checkout <branch>
git rebase <upstream>
By default <branch> is HEAD.
[1] https://www.kernel.org/pub/software/scm/git/docs/git-rebase.html
Thong Kuah
- 3,263
- 2
- 19
- 29
svlasov
- 9,923
- 2
- 38
- 39
