[PATCHv2 1/4] Documentation: enhance branch.<name>.{remote,merge}
- From
- Santi Béjar <santi@agolina.net>
- Date
- Mar 30, 2009, 10:11 UTC
- Message-ID
- <1238407903-28020-2-git-send-email-santi@agolina.net>
- In-Reply-To
- <1238407903-28020-1-git-send-email-santi@agolina.net>
The documentation for branch.*.merge is very dense, so add a simple explanation on top of it.
And branch.*.remote also afects 'git push'. Text taken from 'push.default'.
Signed-off-by: Santi Béjar <santi@agolina.net> --- Documentation/config.txt | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt index 089569a..fa2595b 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/push, and defaults to `origin` if no remote is + configured. `origin` is also used if you are not on any branch. 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. 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