From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 27 Apr 2008 20:37:31 GMT
Subject: Re: [PATCH] Documentation gitk: Describe what --merge does
Message-ID: <7vlk2zf304.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <1209311469-7561-1-git-send-email-richard.quirk@gmail.com>

Richard Quirk <richard.quirk@gmail.com> writes:

> Signed-off-by: Richard Quirk <richard.quirk@gmail.com>
> ---
>  Documentation/gitk.txt |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
> index ed3ba83..edd6547 100644
> --- a/Documentation/gitk.txt
> +++ b/Documentation/gitk.txt
> @@ -41,6 +41,11 @@ frequently used options.
>  
>  	Show all branches.
>  
> +--merge::
> +
> +	Show the differences between HEAD and MERGE_HEAD for files with
> +	conflicts after a merge.
> +

Hmm. "the differences" is technically correct in that it shows the
commits on the diverged histories, but I suspect it would be more
understandable if we used more explicit wording, like:

	After an attempt to merge stops with conflicts, show the commits
	on the history between two branches (i.e. the HEAD and the
	MERGE_HEAD) that modify the conflicted files.