[PATCHv2 3/4] Documentation: branch.*.merge can also afect 'git-push'
From: Santi Béjar <hidden>
Date: 2016-06-15 22:46:31
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
Signed-off-by: Santi Béjar <redacted> --- 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). 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