Re: [orion-dev] git rebase by default

[John Arthorne <John_Arthorne@xxxxxxxxxx>]

Yes I agree rebase is generally much better.
We should generally always be rebasing our changes into master in orion
repositories to avoid cluttering our history with merge commits. Most of
us do this but I still see a couple of "mergers" on the team.
As far as making it easier, there is this bug about adding rebase on the
status page:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=366828

I have been using rebase on the repositories
page. Also if your git configuration has "branch.master.rebase=true"
then doing a "pull" will perform a rebase for you.

John

John J Barton <johnjbarton@xxxxxxxxxxxxxxx>
Sent by: orion-dev-bounces@xxxxxxxxxxx

02/10/2012 12:45 PM

Please respond to
Orion developer discussions <orion-dev@xxxxxxxxxxx>

To	Orion developer discussions <orion-dev@xxxxxxxxxxx>
cc
Subject	[orion-dev] git rebase by default

I sense that git mavens believe that the default workflow
for git
should be rebase rather than merge:

http://d.strelau.net/post/47338904/git-pull-rebase-by-default

If true, then it would be great if Orion can make this default easy to
use.

jjb
_______________________________________________
orion-dev mailing list
orion-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/orion-dev