Dependent Origination

Posts Tagged ‘rebase

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

August 2019
M T W T F S S
« Jun    
 1234
567891011
12131415161718
19202122232425
262728293031  

Twitter

Flickr Photos

Advertisements