On Wed, Jan 4, 2012 at 3:19 PM, Jonathan Ellis <jbel...@gmail.com> wrote:
> On Wed, Jan 4, 2012 at 11:48 AM, paul cannon <p...@datastax.com> wrote: > > On Wed, Jan 4, 2012 at 11:40 AM, Jonathan Ellis <jbel...@gmail.com> > wrote: > > > >> So, can I summarize our policy as "git pull --rebase"? > >> > > > > I'd rather have the normal case be to use topic branches for work, so > > --rebase doesn't come in to the picture, but yeah, pull --rebase is a > > better default. > > You're right. So in the topic branch workflow, I would write that as > "commit by cherry-pick from topic to master, then push." > If the workflow doc also makes clear that that's only for the purely-local topic branch case, and that git rebase can be a lot more helpful than cherry-picking each individual commit, then sure. p
