git pull, merge and rebase

It is always better to rebase local commits while pulling remote published changes. git merge will create a merge entry in the history, rebase is preferred because it orders your local commit on top of the latest remote commits.

To avoid typing --rebase whenever you pull you can config git to use it as default:

git config --global pull.rebase true

The equivalent .gitconfig is:

# This is Git's per-user configuration file.
[pull]
	rebase = true

References

Written with StackEdit.

Leave a Reply

Please log in using one of these methods to post your comment:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out /  Change )

Google photo

You are commenting using your Google account. Log Out /  Change )

Twitter picture

You are commenting using your Twitter account. Log Out /  Change )

Facebook photo

You are commenting using your Facebook account. Log Out /  Change )

Connecting to %s

This site uses Akismet to reduce spam. Learn how your comment data is processed.

%d bloggers like this: