From: Santi Béjar <santi@agolina.net>
Date: Mon, 30 Mar 2009 10:11:42 +0000 (+0200)
Subject: Documentation: branch.*.merge can also affect 'git-push'
X-Git-Tag: v1.6.3-rc0~36
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5c9c990341bad6b4087c2dd99d28a6cb910749df;p=git.git

Documentation: branch.*.merge can also affect 'git-push'

Signed-off-by: Santi Béjar <santi@agolina.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 27cb7f140..3afd12474 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -480,7 +480,7 @@ branch.<name>.remote::
 branch.<name>.merge::
 	Defines, together with branch.<name>.remote, the upstream branch
 	for the given branch. It tells 'git-fetch'/'git-pull' which
-	branch to merge from.
+	branch to merge and can also affect '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