Request for D core devs: git pull --rebase

Kagamin spam at here.lot
Mon Nov 7 23:07:57 PST 2011


Jesse Phillips Wrote:

> On Sat, 05 Nov 2011 15:15:37 -0700, Jonathan M Davis wrote:
> 
> > So, I should probably add the question more explicitly, what exactly
> > does using --rebase gain other than not having the extra commit message?
> > Why is it better?
> > 
> > - Jonathan M Davis
> 
> My quick search:
> 
> http://book.git-scm.com/4_rebasing.html
> 
> Suggests that it will recreate all the changes at the point of merge 
> rather than having a commit with two parents. This would mean the history 
> shows all changes of a branch at the point of merge rather intermixed 
> based on date.

Well... if they're intermixed in time then they should be shown as such.

> One downside to this is that it is a form of history rewrite. And if I 
> understand how git works, this means that the branch in SomeOnes 
> repository will not correspond to any commits in the rebased master. 
> Meaning pulling the latest Phobos into said branch wouldn't work. Usually 
> after a merge the branch would be dead anyway.

In fact, speaking about Don's CTFE fixes, they're merged repeatedly from this branch https://github.com/donc/dmd/commits/ctfeclass which is quite long lasting.


More information about the Digitalmars-d mailing list