From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Oct 2009 21:38:48 GMT
Subject: Re: [PATCH] modernize fetch/merge/pull examples
Message-ID: <7v3a5c2zrr.fsf@alter.siamese.dyndns.org>
In-Reply-To: <20091021172123.GB27495@localhost>

Clemens Buchacher <drizzd@aon.at> writes:

> The "git pull" documentation has examples which follow an outdated
> style. Update the examples to use "git merge" where appropriate and
> move the examples to the corresponding manpages.

Makes sense, although I did some minor rewording.

I noticed something related while reading this (the issue does not affect
the validity of this patch).

> +* Merge branch `maint` into the current branch, but do not make
> +  a commit automatically:
> ++
> +------------------------------------------------
> +$ git merge --no-commit maint
> +------------------------------------------------
> ++
> +This can be used when you want to include further changes to the
> +merge, or want to write your own merge commit message.

When you are up to date with maint this would be a no-op, and when you are
strictly behind maint it will succeed without creating a new commit.

I have two possible approaches to fix this issue.