From: Karl Hasselström <kha@treskal.com>
Date: Mon, 03 Dec 2007 13:10:21 GMT
Subject: Re: [PATCH v2] Teach 'git pull' about --rebase
Message-ID: <20071203131021.GA9674@diana.vm.bytemark.co.uk>
In-Reply-To: <20071201203759.GA11710@atjola.homenet>

On 2007-12-01 21:37:59 +0100, Björn Steinbrink wrote:

> So how about adding --fetch/--no-fetch (maybe with a configurable
> default?) to git-merge/git-rebase and deprecate git-pull over time?

FWIW, I like this idea. rebase/merge is the complicated part of the
operation, so the UI should focus on that. Updating or not updating
the remote-tracking branch that is merged from/rebased on is a simple
binary choice, so a flag is perfect.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle