From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, Ramkumar Ramachandra <artagnon@gmail.com>,
Jeff King <peff@peff.net>,
John Szakmeister <john@szakmeister.net>
Subject: Re: [PATCH v3 0/8] Introduce publish tracking branch
Date: Fri, 11 Apr 2014 20:49:39 +0200 [thread overview]
Message-ID: <vpqeh13aegs.fsf@anie.imag.fr> (raw)
In-Reply-To: <1397239151-2391-1-git-send-email-felipe.contreras@gmail.com> (Felipe Contreras's message of "Fri, 11 Apr 2014 12:59:03 -0500")
Felipe Contreras <felipe.contreras@gmail.com> writes:
> * Override other configurations (such as push.default)
I think I convinced myself that this is the right way to go since my
last message. After all, "push.default" is, by definition, just a
default.
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -764,6 +764,13 @@ branch.<name>.mergeoptions::
> option values containing whitespace characters are currently not
> supported.
>
> +branch.<name>.push::
> + Defines, together with branch.<name>.pushremote, the publish branch for
> + the given branch. It tells 'git push' which branch to push to, and
> + overrides any other configurations, such as push.default. It also tells
> + commands such as 'git status' and 'git branch' which remote branch to
> + use for tracking information (commits ahead and behind).
> +
Good.
I think this text should mention the @{publish} shorthand too. Stg like
"This branch can be refered to as @{publish} when specifying revision
(see linkgit:gitrevisions[7])."
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
prev parent reply other threads:[~2014-04-11 18:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-11 17:59 [PATCH v3 0/8] Introduce publish tracking branch Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 1/8] t5516 (fetch-push): fix test restoration Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 2/8] Add concept of 'publish' branch Felipe Contreras
2014-04-11 19:48 ` Junio C Hamano
2014-04-11 17:59 ` [PATCH v3 3/8] branch: add --set-publish-to option Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 4/8] push: add --set-publish option Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 5/8] branch: display publish branch Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 6/8] sha1_name: cleanup interpret_branch_name() Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 7/8] sha1_name: simplify track finding Felipe Contreras
2014-04-11 17:59 ` [PATCH v3 8/8] sha1_name: add support for @{publish} marks Felipe Contreras
2014-04-11 18:49 ` Matthieu Moy [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpqeh13aegs.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=artagnon@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=john@szakmeister.net \
--cc=peff@peff.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 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 NNTP newsgroup(s).