From: Catalin Marinas Date: Wed, 31 Jan 2007 23:44:07 GMT Subject: Re: [PATCH 7/7] Make 'stg pull' use git-fetch and not git-pull. Message-ID: In-Reply-To: <20070129230555.7102.93948.stgit@gandelf.nowhere.earth> On 29/01/07, Yann Dirson wrote: > We introduce a new pull-does-rebase setting, as companion to pullcmd. > This allows to use both pullcmd's that need a rebase (like git-fetch) > and pullcmd's that do not (like git-pull). Thanks for the patches. I applied all of them but I have a question on this one: > + if (config.get('stgit.pull-does-rebase')): > + # FIXME! > + reset(tree_id = rev_parse(repository)) Why the "FIXME" here? The alternative is switch() and it might be safer. -- Catalin