git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: git@vger.kernel.org, Johan Herland <johan@herland.net>,
	Ramkumar Ramachandra <artagnon@gmail.com>
Subject: Re: [PATCH v2] push: Re-include "push.default=tracking" in the documentation
Date: Mon, 20 Mar 2017 11:01:26 -0700	[thread overview]
Message-ID: <xmqqfui7x1xl.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170319143636.23810-1-avarab@gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Sun, 19 Mar 2017 14:36:36 +0000")

Ævar Arnfjörð Bjarmason  <avarab@gmail.com> writes:

> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index eccc012672..988659e16c 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -2459,6 +2459,8 @@ push.default::
>    pushing to the same repository you would normally pull from
>    (i.e. central workflow).
>  
> +* `tracking` - This is a deprecated synonym for `upstream`.
> +
>  * `simple` - in centralized workflow, work like `upstream` with an
>    added safety to refuse to push if the upstream branch's name is
>    different from the local one.

Thanks for following through ;-)  Will queue.


      reply	other threads:[~2017-03-20 18:02 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-10-06  8:49 [PATCH] push: Re-include "push.default=tracking" in the documentation Ævar Arnfjörð Bjarmason
2016-10-06  9:13 ` Johan Herland
2016-10-06 12:13 ` Matthieu Moy
2016-10-06 16:18   ` Ævar Arnfjörð Bjarmason
2016-10-06 16:27     ` Matthieu Moy
2016-10-06 18:24       ` Junio C Hamano
2017-03-19 14:36         ` [PATCH v2] " Ævar Arnfjörð Bjarmason
2017-03-20 18:01           ` Junio C Hamano [this message]

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=xmqqfui7x1xl.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=artagnon@gmail.com \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=johan@herland.net \
    /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).