On Thu, 25 Oct 2007, Karl Hasselström wrote: > 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. Isn't that called a remote branch that gets updated with "git fetch' ? You can even trick Git into not using the refs/remotes/ namespace for them if you wish. Nicolas