Dependent Origination

git pull with rebase

Posted on: February 6, 2013

git pull –rebase

without rebase, it pulls the changes in depot and does a merge with the current branch.

with rebase, it pulls the changes in depot and applies your changes on top of those.

the difference is in the history: one is a merge, the other is a straight line going forward.

you can also set the following in your ~/.gitconfig file

[branch]
autosetuprebase = always

This article explains well.

Advertisements

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com 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 )

Google+ photo

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

Connecting to %s

February 2013
M T W T F S S
« Jan   Mar »
 123
45678910
11121314151617
18192021222324
25262728  

Twitter

Flickr Photos

%d bloggers like this: