On Tue, Mar 12, 2013 at 02:30:04PM -0700, Junio C Hamano wrote:
> Theodore Ts'o <tytso@xxxxxxx> writes:
>
> > [remote "origin"]
> > url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> > fetch = +refs/heads/master:refs/heads/master
> > mergeoptions = --ff-only
> >
>
> Is there an escape hatch for that rare case? IOW, how does a
> submaintainer who configured the above to override --ff-only?
Hmm, maybe we would need to add a --no-ff-only? Or they could just
do:
git fetch origin
git merge FETCH_HEAD
On Tue, Mar 12, 2013 at 02:28:39PM -0700, Linus Torvalds wrote:
>
> Of course, I'm not really sure if we want to list the flags. Maybe
> it's better to just introduce the notion of "upstream" directly, and
> make that a flag, and make "origin" default to that when you clone.
> And then have git use different heurstics for pulling upstream (like
> warning by default when doing a back-merge, perhaps?)
What if git automaticallly set up the origin branch to have a certain
set of mergeoptions by default? That would probably be right for most
users, but it makes it obvious what's going on when they take a look
at the .git/config file, and doesn't make the remote that happens to
have the name "origin" as having certain magic properties. Using a
set of mergeoptions would also be bit more general, and might have
applications in the future.
- Ted
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html