[haiku-development] Re: [haiku] Subversion to Git migration scheduled for November 12, 2011

  • From: Ryan Leavengood <leavengood@xxxxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Thu, 3 Nov 2011 21:01:30 -0400

On Thu, Nov 3, 2011 at 8:47 PM, Travis Geiselbrecht <geist@xxxxxxxxxx> wrote:
>
> These are great. Interesting that we actually have the same ones for
> about half of these.
>
> Here are a few more
>
> alias gru='git remote update --prune'
> alias grc='git rebase --continue'

Hmmm, remote update --prune is not something I'm familiar with, why do
you use that? grc is one I'll add to my arsenal for sure.

> Good to see you're using 'git pull --rebase' and in general using a
> 'rebase your local branch on the upstream branch instead of creating a
> merge commit' strategy to dealing with local branches, especially
> before pushing upstream. It's a bit more conceptually difficult, but
> it's much nicer on the main repository when there aren't any more
> extraneous merge commits than necessary. I don't know if this should
> be the official policy, but it's one I've maintained at work for a few
> years and it generally works well.

Yeah I learned about git pull --rebase at a particularly good Ruby on
Rails consultancy I worked at a few years ago. I use it pretty much
all the time now. I think we should seriously consider making it the
official Haiku policy once we make the switch to Git. Otherwise our
Git history will just be a mess of merge commits.

-- 
Regards,
Ryan

Other related posts:

  1. Home
  2. haiku-development
  3. Archive
  4. 11-2011