diff options
| author | Josef Weidendorfer <Josef.Weidendorfer@gmx.de> | 2006-12-09 02:28:26 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-08 18:13:31 -0800 |
| commit | 62b339a544b1fa5199de7571c460d770cb286e65 (patch) | |
| tree | 6c82f20b50bacb40f8a55ac48ac2aac3cc27f2d2 /Documentation/config.txt | |
| parent | 2cdf87ebd9976d98d544669d94b111fea731d2ba (diff) | |
| download | git-62b339a544b1fa5199de7571c460d770cb286e65.tar.gz git-62b339a544b1fa5199de7571c460d770cb286e65.tar.xz | |
Add branch.*.merge warning and documentation update
This patch clarifies the meaning of the branch.*.merge option.
Previously, if branch.*.merge was specified but did not match any
ref, the message "No changes." was not really helpful regarding
the misconfiguration. This patch adds a warning for this.
Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 909076281..21ec55797 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -125,10 +125,17 @@ apply.whitespace:: 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". branch.<name>.merge:: - When in branch <name>, it tells `git fetch` the default remote branch - to be merged. + When in branch <name>, it tells `git fetch` the default refspec to + be marked for merging in FETCH_HEAD. The value has exactly to match + a remote part of one of the refspecs which are fetched from the remote + given by "branch.<name>.remote". + The merge information is used by `git pull` (which at first calls + `git fetch`) to lookup the default branch for merging. Without + this option, `git pull` defaults to merge the first refspec fetched. + Specify multiple values to get an octopus merge. pager.color:: A boolean to enable/disable colored output when the pager is in |