[PATCH 3/4] Documentation: branch.*.merge can also afect 'git-push'

From

SBSanti Béjar <santi@agolina.net>

Date

Mar 28, 2009, 23:10 UTC

Message-ID

<1238281804-30290-4-git-send-email-santi@agolina.net>

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