diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-23 11:15:35 +0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-23 11:15:35 +0400 |
| commit | c80e07d4959591f5addcd48c7d42017b40c25f36 (patch) | |
| tree | 7c4efc66c415a180ef62015b17607dad44cccadf /Documentation | |
| parent | 523d12e5003eee0c2cb670b51e39d719cd56aacd (diff) | |
| parent | 9902387d20e7a73662a97f5c4b66ba4ec80dc9ce (diff) | |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
Document branch.autosetupmerge.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 4bbe1162cb..c1306a69e5 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -287,6 +287,13 @@ apply.whitespace:: Tells `git-apply` how to handle whitespaces, in the same way as the '--whitespace' option. See gitlink:git-apply[1]. +branch.autosetupmerge:: + Tells `git-branch' and `git-checkout' to setup new branches + so that gitlink:git-pull[1] will appropriately merge from that + remote branch. Note that even if this option is not set, + this behavior can be chosen per-branch using the `--track` + and `--no-track` options. This option defaults to false. + 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". |