On Thu, May 23, 2013 at 12:29:59PM +0200, Andreas Krey wrote:
> On Thu, 23 May 2013 05:48:38 +0000, John Szakmeister wrote:
> > This is a feature of `git pull` that I really despise. I really wish
> > `git pull` treated the remote as the first parent in its merge
> > operation.
> I'd actually only like it that way when pulling from
> the tracking branch, not for any pull.
I'll add my voice to the "annoyed by this" pile ;-)
I've been annoyed by this at $DAYJOB recently. A lot of people seem to
blindly "git pull" without much thought about how the history is ending
up and what they actually want to do.
I wonder if it would make sense for "git pull" (with no arguments) to
pass "--ff-only" to git-merge, allowing this to be overridden with
--rebase and --merge (which doesn't currently exist). With some
suitable advice output we could hopefully educate users about how to
shape their history.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html