From: Andreas Schwab <schwab@linux-m68k.org>
To: Taylor Blau <me@ttaylorr.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Fabien Terrani <terranifabien@gmail.com>,
git@vger.kernel.org
Subject: Re: remote.<name>.merge missing from the git-config man page?
Date: Mon, 08 Mar 2021 21:14:33 +0100 [thread overview]
Message-ID: <87pn092yja.fsf@igel.home> (raw)
In-Reply-To: <YEZwY0721KvQNkK+@nand.local> (Taylor Blau's message of "Mon, 8 Mar 2021 13:43:47 -0500")
On Mär 08 2021, Taylor Blau wrote:
> diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
> index ab103c82cf..a953c7c387 100644
> --- a/Documentation/git-push.txt
> +++ b/Documentation/git-push.txt
> @@ -600,7 +600,7 @@ EXAMPLES
>
> `git push origin`::
> Without additional configuration, pushes the current branch to
> - the configured upstream (`remote.origin.merge` configuration
> + the configured upstream (`branch.<name>.merge` configuration
> variable) if it has the same name as the current branch, and
> errors out without pushing otherwise.
That doesn't say what <name> is. Is that supposed to be <branch>?
Also, what is "it" referring to in "if it has the same name"?
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 7578 EB47 D4E5 4D69 2510 2552 DF73 E780 A9DA AEC1
"And now for something completely different."
next prev parent reply other threads:[~2021-03-08 20:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 12:10 remote.<name>.merge missing from the git-config man page? Fabien Terrani
2021-03-08 16:57 ` Eric Sunshine
2021-03-08 17:27 ` Junio C Hamano
2021-03-08 18:43 ` Taylor Blau
2021-03-08 20:14 ` Andreas Schwab [this message]
2021-03-08 20:28 ` Taylor Blau
2021-03-08 20:41 ` Andreas Schwab
2021-03-08 20:45 ` Taylor Blau
2021-03-08 20:57 ` Andreas Schwab
2021-03-08 21:06 ` Taylor Blau
2021-03-08 21:58 ` Andreas Schwab
2021-03-12 23:45 ` Junio C Hamano
2021-03-13 7:59 ` Jonathan Nieder
2021-03-08 21:20 ` Junio C Hamano
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=87pn092yja.fsf@igel.home \
--to=schwab@linux-m68k.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ttaylorr.com \
--cc=terranifabien@gmail.com \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.