diff options
| author | Santi Béjar <santi@agolina.net> | 2009-03-30 12:11:40 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-30 09:19:37 -0700 |
| commit | 76d3cc50b518d1c28d802ad2917063d8a5d34419 (patch) | |
| tree | 2892184f06b3388295b0b88e961302b1715721ab /Documentation | |
| parent | f2ad051fd120714cbe9dcee5d94942e0105bb0aa (diff) | |
| download | git-76d3cc50b518d1c28d802ad2917063d8a5d34419.tar.gz git-76d3cc50b518d1c28d802ad2917063d8a5d34419.tar.xz | |
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>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 750675530..a6fc8da0b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -473,10 +473,14 @@ branch.autosetuprebase:: This option defaults to never. branch.<name>.remote:: - When in branch <name>, it tells 'git-fetch' which remote to fetch. - If this option is not given, 'git-fetch' defaults to remote "origin". + When in branch <name>, it tells 'git-fetch' and 'git-push' which + remote to fetch from/push to. It defaults to `origin` if no remote is + configured. `origin` is also used if you are not on any branch. branch.<name>.merge:: + Defines, together with branch.<name>.remote, the upstream branch + for the given branch. It tells 'git-fetch'/'git-pull' which + branch to merge from. 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 |