From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] doc: merge: mention default of defaulttoupstream
Date: Tue, 08 Jun 2021 14:24:35 +0900 [thread overview]
Message-ID: <xmqqy2blorn0.fsf@gitster.g> (raw)
In-Reply-To: <20210608015807.906101-1-felipe.contreras@gmail.com> (Felipe Contreras's message of "Mon, 7 Jun 2021 20:58:07 -0500")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> Commit a01f7f2ba0 (merge: enable defaulttoupstream by default,
> 2014-04-20) forgot to mention the new default in the configuration
> documentation.
>
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> Documentation/config/merge.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
> index cb2ed58907..6b66c83eab 100644
> --- a/Documentation/config/merge.txt
> +++ b/Documentation/config/merge.txt
> @@ -14,7 +14,7 @@ merge.defaultToUpstream::
> branches at the remote named by `branch.<current branch>.remote`
> are consulted, and then they are mapped via `remote.<remote>.fetch`
> to their corresponding remote-tracking branches, and the tips of
> - these tracking branches are merged.
> + these tracking branches are merged. Defaults to true.
That's definititely an improvement.
Will queue.
By the way, is the convoluted description around remote-tracking
branches still understandable to those who often work on a branch
forked from another local branch, or would readers be helped if we
had a two separate descriptions (one forking from remote and the
other forking locally)? This is a side question as the answer does
not change the validity of this patch at all.
Thanks.
next prev parent reply other threads:[~2021-06-08 5:24 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-08 1:58 [PATCH] doc: merge: mention default of defaulttoupstream Felipe Contreras
2021-06-08 5:24 ` Junio C Hamano [this message]
2021-06-08 7:29 ` Felipe Contreras
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy2blorn0.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).