Documentation: enhance branch.<name>.{remote,merge}
The documentation for branch.*.merge is very dense, so add a simple explanation on top of it. And branch.*.remote also affects '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
76d3cc50b518d1c28d802ad2917063d8a5d34419
1 file changed
+6
-2
Documentation/config.txt
+6
-2
@@ -473,10 +473,14 @@ branch.autosetuprebase::
473
This option defaults to never.
474
475
branch.<name>.remote::
476
- When in branch <name>, it tells 'git-fetch' which remote to fetch.
477
- If this option is not given, 'git-fetch' defaults to remote "origin".
476
+ When in branch <name>, it tells 'git-fetch' and 'git-push' which
477
+ remote to fetch from/push to. It defaults to `origin` if no remote is
478
+ configured. `origin` is also used if you are not on any branch.
479
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.
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