{"data":{"site":{"siteMetadata":{"title":"FrontCode Blog","author":"Robert Kisiel"}},"markdownRemark":{"id":"2993d065-ab3f-5338-993d-ac821589e5e0","excerpt":"So I’m one of those developers who prefer rebasing instead of merging to keep a nice linear commit history. Whenever I got rejected on pushing a branch to…","html":"

So I’m one of those developers who prefer rebasing instead of merging to keep a nice linear commit history.

\n

Whenever I got rejected on pushing a branch to remote (e.g. because someone meanwhile introduced new changes) I have been using first git fetch followed by git rebase origin/the-branch to put my changes on top of everything. Recently I discovered that there is an easier way, it’s: git pull --rebase.

\n

In short it does exactly what is done with the two mentioned. So instead of:

\n
git fetch\ngit rebase origin/the-branch
\n

I’m using:

\n
git pull --rebase
","frontmatter":{"title":"git pull --rebase - Today I learned","date":"February 25, 2019"}}},"pageContext":{"slug":"/git-pull-with-rebase/","previous":{"fields":{"slug":"/hello-world/"},"frontmatter":{"title":"Hello world - yet another developer blog"}},"next":{"fields":{"slug":"/where-i-get-knowledge/"},"frontmatter":{"title":"Where I get knowledge"}}}}