From: Santi Béjar Date: Mon, 30 Mar 2009 10:11:42 GMT Subject: [PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push' Message-ID: <1238407903-28020-4-git-send-email-santi@agolina.net> In-Reply-To: <1238407903-28020-1-git-send-email-santi@agolina.net> Signed-off-by: Santi Béjar --- 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..remote:: branch..merge:: It defines, together with branch..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). When in branch , 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