diff options
| author | Paolo Bonzini <paolo.bonzini@lu.unisi.ch> | 2007-05-23 05:07:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-23 05:42:42 (GMT) |
| commit | 9902387d20e7a73662a97f5c4b66ba4ec80dc9ce (patch) | |
| tree | d8d0b52f583084fb445e2b4f7c8851e2a4365be6 /Documentation | |
| parent | 0ba956d331e4c14fb1600a62044492c6c27af71a (diff) | |
| download | git-9902387d20e7a73662a97f5c4b66ba4ec80dc9ce.zip git-9902387d20e7a73662a97f5c4b66ba4ec80dc9ce.tar.gz git-9902387d20e7a73662a97f5c4b66ba4ec80dc9ce.tar.bz2 | |
Document branch.autosetupmerge.
This patch documents the branch.autosetupmerge config option, added
by commit 0746d19a.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 c3fc64a..6593f2e 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". |