From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Git <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>,
Johan Herland <johan@herland.net>,
Ramkumar Ramachandra <artagnon@gmail.com>
Subject: Re: [PATCH] push: Re-include "push.default=tracking" in the documentation
Date: Thu, 06 Oct 2016 18:27:27 +0200 [thread overview]
Message-ID: <vpqlgy1h28g.fsf@anie.imag.fr> (raw)
In-Reply-To: <CACBZZX5ycZbFrrVgr4PVy5pKQDbnvmvDxuephx7-uHzzcm3u=g@mail.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Thu, 6 Oct 2016 18:18:18 +0200")
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
> Junio, looks like from the 2013 discussion that you preferred just
> having that mention in parenthesis instead of its own item, how about
> just re-applying your fa23348 (with conflicts resolved)?
(fa23348 did this:
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1749,7 +1749,8 @@ push.default::
+
This is currently the default, but Git 2.0 will change the default
to `simple`.
-* `upstream` - push the current branch to its upstream branch.
+* `upstream` - push the current branch to its upstream branch
+ (`tracking` is a deprecated synonym for this).
)
I agree that doing the same thing is the best option.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2016-10-06 16:28 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 [this message]
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
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=vpqlgy1h28g.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=artagnon@gmail.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--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.
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.