git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Eric Sunshine <sunshine@sunshineco.com>
To: Fabien Terrani <terranifabien@gmail.com>
Cc: Git List <git@vger.kernel.org>,
	Adam Sharafeddine <adam.shrfdn@gmail.com>,
	Philippe Blain <levraiphilippeblain@gmail.com>
Subject: Re: remote.<name>.merge missing from the git-config man page?
Date: Mon, 8 Mar 2021 11:57:19 -0500	[thread overview]
Message-ID: <CAPig+cR13JTmLmjk=g8sFowEY2zNZiqVFCHOCYnQ9LX5URjdGA@mail.gmail.com> (raw)
In-Reply-To: <CAOuwed4HJLTgk48Fre5vGYjYanqD6hu8yZM73CpcAmF1ajiTnA@mail.gmail.com>

[cc:+adam +phillipe]

On Mon, Mar 8, 2021 at 7:11 AM Fabien Terrani <terranifabien@gmail.com> wrote:
> I was recently trying to understand the git-push command's behavior,
> especially regarding the configuration values's resolution. I read the
> following in the EXAMPLES section of the git-push man page:
>
> > git push origin
> >     Without additional configuration, pushes the current branch to the configured upstream (remote.origin.merge configuration variable) if it has the same name as the current branch, and errors out without pushing otherwise.
>
> I then had a look at the git-config man page and I was surprised to
> notice that there was no documentation at all about a
> remote.<name>.merge or remote.origin.merge configuration value. I am
> definitely not a git expert but this looks strange to me. Am I missing
> something? Is remote.<name>.merge used by git at all?

Yours is the second report[1] about this in a few weeks.

> (before mailing here, I tried carefully examining git's source code to
> see if there was a remote.<name>.merge value used somewhere. I can't
> be 100% positive since this was very complex to me, but I personally
> couldn't find anything referencing remote.<name>.merge, while I found
> code using other values like remote.<name>.push, push.default etc.)

I spent a bit of time going through the source code, as well, trying
to determine the correct name of this variable but didn't arrive at an
answer before having to turn to other tasks.

Hopefully, someone more familiar with this area of the project can
chime in with the correct answer and more useful response.

[1]: https://lore.kernel.org/git/CAAxrY9yjTKV8-K0AmO4fBmtDrSB4KkN_xKOMmtSb-dvixJNaEQ@mail.gmail.com/T/

  reply	other threads:[~2021-03-08 16:58 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 [this message]
2021-03-08 17:27 ` Junio C Hamano
2021-03-08 18:43   ` Taylor Blau
2021-03-08 20:14     ` Andreas Schwab
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

  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='CAPig+cR13JTmLmjk=g8sFowEY2zNZiqVFCHOCYnQ9LX5URjdGA@mail.gmail.com' \
    --to=sunshine@sunshineco.com \
    --cc=adam.shrfdn@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=levraiphilippeblain@gmail.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.
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).