Signed-off-by: Santi Béjar <santi@xxxxxxxxxxx> --- 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
