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>
Santi Béjar committed
Mar 30, 2009 at 12:11 UTC
5c9c990341bad6b4087c2dd99d28a6cb910749df
1 file changed
+1
-1
Documentation/config.txt
+1
-1
@@ -480,7 +480,7 @@ branch.<name>.remote::
480
branch.<name>.merge::
481
Defines, together with branch.<name>.remote, the upstream branch
482
for the given branch. It tells 'git-fetch'/'git-pull' which
483
- branch to merge from.
483
+ branch to merge and can also affect 'git-push' (see push.default).
484
When in branch <name>, it tells 'git-fetch' the default
485
refspec to be marked for merging in FETCH_HEAD. The value is
486
handled like the remote part of a refspec, and must match a