diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-23 07:16:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-23 07:16:11 (GMT) |
| commit | e97593693ed36da918413732c9ca4b09c3e9d213 (patch) | |
| tree | 9c06adffc5bf959829e20024fdadc4c9f8d9e230 /Documentation | |
| parent | a3342a2f52a5351739577f8773eab2a1db20b651 (diff) | |
| parent | c80e07d4959591f5addcd48c7d42017b40c25f36 (diff) | |
| download | git-e97593693ed36da918413732c9ca4b09c3e9d213.zip git-e97593693ed36da918413732c9ca4b09c3e9d213.tar.gz git-e97593693ed36da918413732c9ca4b09c3e9d213.tar.bz2 | |
Merge branch 'maint'
* maint:
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 179cb17..eb2e79a 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -280,6 +280,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". |