From: "Santi Béjar" <santi@agolina.net>
To: git@vger.kernel.org
Subject: [PATCH 3/4] Documentation: branch.*.merge can also afect 'git-push'
Date: Sun, 29 Mar 2009 00:10:03 +0100 [thread overview]
Message-ID: <1238281804-30290-4-git-send-email-santi@agolina.net> (raw)
In-Reply-To: <1238281804-30290-1-git-send-email-santi@agolina.net>
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 07f88f5..cb392fd 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 tracking branch
for the current branch. It tells 'git-fetch'/'git-pull' which
- branch to merge.
+ branch to merge and can also afect 'git-push' (see push.default).
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
--
1.6.1.258.g7ff14
next prev parent reply other threads:[~2009-03-28 23:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-28 23:10 [PATCH 0/4] push.default and branch.<name>.{remote,merge} changes Santi Béjar
2009-03-28 23:10 ` [PATCH 1/4] Documentation: enhance branch.<name>.{remote,merge} Santi Béjar
2009-03-29 1:38 ` Jay Soffian
2009-03-29 10:54 ` Santi Béjar
2009-03-28 23:10 ` [PATCH 2/4] Documentation: push.default applies to all remotes Santi Béjar
2009-03-28 23:10 ` Santi Béjar [this message]
2009-03-28 23:10 ` [PATCH 4/4] Rename push.default to push.style Santi Béjar
2009-03-30 8:01 ` Finn Arne Gangstad
2009-03-30 8:23 ` Johannes Schindelin
2009-03-30 9:00 ` Santi Béjar
2009-03-30 9:07 ` Santi Béjar
2009-03-30 10:29 ` Jeff King
2009-03-30 12:50 ` Santi Béjar
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=1238281804-30290-4-git-send-email-santi@agolina.net \
--to=santi@agolina.net \
--cc=git@vger.kernel.org \
/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).