From: Junio C Hamano <gitster@pobox•com>
To: sorganov@gmail•com
Cc: git@vger•kernel.org
Subject: Re: [PATCH 4/6] Documentation/git-merge.txt: improve short description in NAME
Date: Wed, 05 Oct 2016 10:52:25 -0700 [thread overview]
Message-ID: <xmqqa8eiptt2.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <a33dd3ec3da0dc2dad72ed85edd29ff01f898831.1475678515.git.sorganov@gmail.com> (sorganov@gmail.com's message of "Wed, 5 Oct 2016 17:46:22 +0300")
sorganov@gmail•com writes:
> From: Sergey Organov <sorganov@gmail•com>
>
> Old description not only raised the question of why the tool is called
> git-merge rather than git-join, but "join histories" also sounds like
> very simple operation, something like what "git-merge -s ours" does.
>
> Signed-off-by: Sergey Organov <sorganov@gmail•com>
> ---
> Documentation/git-merge.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
> index 216d2f4..cc0329d 100644
> --- a/Documentation/git-merge.txt
> +++ b/Documentation/git-merge.txt
> @@ -3,7 +3,8 @@ git-merge(1)
>
> NAME
> ----
> -git-merge - Join two or more development histories together
> +
> +git-merge - Merge one or more branches to the current branch
This patch, evaluated by itself, looks like a regression in that it
tries to explain "merge" by using verb "merge", making it fuzzier to
those who do not yet know what a "merge" is. That was why it tried
to explain "merge" as an operation to join histories.
However, the next one, 5/6, resurrects the "join history" in the
description part to help them, so the damage is not so severe when
we take them together.
I haven't formed firm opinion on this patch yet.
next prev parent reply other threads:[~2016-10-05 17:52 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 14:46 [PATCH 0/6] git-merge: a few documentation improvements sorganov
2016-10-05 14:46 ` [PATCH 1/6] git-merge: clarify "usage" by adding "-m <msg>" sorganov
2016-10-05 17:46 ` Junio C Hamano
2016-10-05 20:41 ` Sergey Organov
2016-10-05 14:46 ` [PATCH 2/6] Documentation/git-merge.txt: remove list of options from SYNOPSIS sorganov
2016-10-05 17:47 ` Junio C Hamano
2016-10-05 21:03 ` Sergey Organov
2016-10-05 14:46 ` [PATCH 3/6] Documentation/git-merge.txt: fix SYNOPSIS of obsolete form to include options sorganov
2016-10-05 14:46 ` [PATCH 4/6] Documentation/git-merge.txt: improve short description in NAME sorganov
2016-10-05 17:52 ` Junio C Hamano [this message]
2016-10-05 21:01 ` Sergey Organov
2016-10-05 17:55 ` Jeff King
2016-10-05 20:44 ` Sergey Organov
2016-10-05 14:46 ` [PATCH 5/6] Documentation/git-merge.txt: improve short description in DESCRIPTION sorganov
2016-10-05 16:58 ` Jakub Narębski
2016-10-05 20:01 ` Junio C Hamano
2016-10-05 21:27 ` Sergey Organov
2016-10-06 13:21 ` Sergey Organov
2016-10-05 18:07 ` Junio C Hamano
2016-10-05 21:24 ` Sergey Organov
2016-10-05 21:41 ` Junio C Hamano
2016-10-06 12:30 ` Sergey Organov
2016-10-06 17:46 ` Junio C Hamano
2016-10-07 13:13 ` Sergey Organov
2016-10-05 14:46 ` [PATCH 6/6] Documentation/git-merge.txt: get rid of irrelevant references to git-pull sorganov
2016-10-05 18:57 ` Junio C Hamano
2016-10-05 21:34 ` Sergey Organov
2016-10-05 21:43 ` Junio C Hamano
2016-10-06 12:39 ` Sergey Organov
2016-10-06 18:06 ` Junio C Hamano
2016-10-07 11:45 ` Sergey Organov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqa8eiptt2.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sorganov@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox