From: Karl Hasselström Date: Thu, 25 Oct 2007 15:01:07 GMT Subject: Re: recent change in git.git/master broke my repos Message-ID: <20071025150107.GB31196@diana.vm.bytemark.co.uk> In-Reply-To: <86oden6z97.fsf@blue.stonehenge.com> On 2007-10-25 07:32:36 -0700, Randal L. Schwartz wrote: > And when are we gonna get "fast forward only" for git-merge? I'd like that too. For cases when I know I don't have to do a merge, and want git to yell at me if I'm mistaken. For example, in a repository that tracks an upstream so I can build the latest version, but where I don't normally do any development. -- Karl Hasselström, kha@treskal.com www.treskal.com/kalle