What happens when I 'git pull --rebase origin development' from within a feature branch?

git rebase feature-branch
M Jacobs picture M Jacobs · Mar 11, 2014 · Viewed 9.1k times · Source

Let's say I have a feature branch called FeatureA, and it is out of sync with (remote) development on which it is based. Normally I would rebase my branch by calling git rebase development (after syncing my local development with origin/development naturally).

Today, I do it different and call git pull --rebase origin development from my feature-branch instead. Now, what is the difference?

Answer

janos picture janos · Mar 11, 2014

git pull --rebase origin development is a shortcut to these commands:

git fetch origin development
git rebase origin/development

That is, fetch origin/development and then rebase the current branch on top of it.

UPDATE

As @torek pointed out:

Yes, except that the two-argument version of fetch does not update origin/development in git 1.8.3 or earlier. (The rebase result is the same, but origin/development does not move.)

Related questions

Rebasing remote branches in Git

I am using an intermediate Git repository to mirror a remote SVN repository, from which people can clone and work on. The intermediate repository has it's master branch rebased nightly from the upstream SVN, and we are working on feature …

Read More
Squash my last X commits together using Git

How can I squash my last X commits together into one commit using Git?

Read More
Git refusing to merge unrelated histories on rebase

During git rebase origin/development the following error message is shown from Git: fatal: refusing to merge unrelated histories Error redoing merge 1234deadbeef1234deadbeef My Git version is 2.9.0. It used to work fine in the previous version. How can I …

Read More