From: Michael J Gruber <git@drmicha.warpmail.net>
To: "Santi Béjar" <santi@agolina.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'
Date: Mon, 30 Mar 2009 12:35:10 +0200 [thread overview]
Message-ID: <49D0A05E.7060708@drmicha.warpmail.net> (raw)
In-Reply-To: <1238407903-28020-4-git-send-email-santi@agolina.net>
Santi Béjar venit, vidit, dixit 30.03.2009 12:11:
>
> Signed-off-by: Santi Béjar <santi@agolina.net>
> ---
> Documentation/config.txt | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index 7ae584f..38ab785 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -480,7 +480,7 @@ branch.<name>.remote::
> branch.<name>.merge::
> It defines, together with branch.<name>.remote, the upstream branch
> for the given branch. It tells 'git-fetch'/'git-pull' which
> - branch to merge.
> + branch to merge and can also afect 'git-push' (see push.default).
s/afect/affect/
> When in branch <name>, it tells 'git-fetch' the default
> refspec to be marked for merging in FETCH_HEAD. The value is
> handled like the remote part of a refspec, and must match a
next prev parent reply other threads:[~2009-03-30 11:37 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-30 10:11 [PATCHv2 0/4] push.default and branch.<name>.{remote,merge} changes Santi Béjar
2009-03-30 10:11 ` [PATCHv2 1/4] Documentation: enhance branch.<name>.{remote,merge} Santi Béjar
2009-03-30 10:11 ` [PATCHv2 2/4] Documentation: push.default applies to all remotes Santi Béjar
2009-03-30 10:11 ` [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push' Santi Béjar
2009-03-30 10:35 ` Michael J Gruber [this message]
2009-03-30 16:47 ` Junio C Hamano
2009-03-30 22:06 ` Santi Béjar
2009-04-02 6:08 ` Junio C Hamano
2009-03-30 10:11 ` [PATCHv2 4/4] Rename push.default to push.mode Santi Béjar
2009-03-30 10:42 ` Michael J Gruber
2009-03-30 12:37 ` Santi Béjar
2009-03-30 13:06 ` Michael J Gruber
2009-03-30 13:45 ` Jeff King
2009-03-30 14:47 ` Michael J Gruber
2009-03-30 18:02 ` Jeff King
2009-03-31 12:55 ` Michael J Gruber
2009-03-31 13:08 ` Jeff King
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=49D0A05E.7060708@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=santi@agolina.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).