JIYIK CN >

This article discusses the difference between the git rebase origin/branch and git rebase origin branch commands. We use both commands to rebase from a remote, but their actual uses are different, which we will discuss later.

Difference between git rebase origin/branch and git rebase origin master commands

To understand the difference between these two commands, let’s look at what each command does and the workflow they follow.

git rebase origin/branch command

Let's look at the following example:

$ git rebase origin/master

This command means that we want to rebase a branch from our upstream master branch. However, the command alone cannot get the job done.

Before running this command, you need to fetch from the upstream master branch.

Alternatively, you can use the traditional way:

1. git checkout masterSwitch to your master branch using the command.
2. Use git pull origin masterthe command to pull from the upstream master branch.
3. Use git checkout <branch-name>the command to switch back to the branch you want to rebase.
4. Now you can run git rebase origin/master.

This should update the commits in your branch with the commits in the upstream master branch.

git rebase origin master command

git rebase origin master is the combination of the two commits.

$ git checkout master

and

$ git rebase origin

We all know git rebase originthat means we are rebasing from origin's tracking branch or in other words, our upstream. Therefore, we can infer that git rebase origin masterwe will switch to our master branch and rebase it from the remote tracking branch.

If your master branch does not have a remote tracking branch, the command will fail. You can fix this by setting up an upstream tracking branch, as follows:

$ git branch --set-upstream-to=origin/master

Before running the command above, make sure you are checked out in the master branch.

Summarize

From the above we can conclude git rebase origin masterthat is used to rebase master branch from the upstream tracking branch, while git rebase origin/masteris used to rebase a specific branch from the upstream master branch.

However, git rebase origin/masternew commits in the upstream master branch will not be picked up. Before rebasing, you must update your local master branch.