summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-11 21:23:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-02-11 21:23:06 (GMT)
commit04f32cf1b31717bf0b7cbbc00783a4107cc19cfd (patch)
treefaa82765b851e6f0cabfe37e4936d5ca1bf623ec /Documentation/config.txt
parent94bf9f7c37cca0241785a5f4e54e5cc98e175244 (diff)
parent6c47d0e8f3983cff5bf633cb8e6f7ecfecf48db7 (diff)
downloadgit-04f32cf1b31717bf0b7cbbc00783a4107cc19cfd.zip
git-04f32cf1b31717bf0b7cbbc00783a4107cc19cfd.tar.gz
git-04f32cf1b31717bf0b7cbbc00783a4107cc19cfd.tar.bz2
Merge branch 'maint'
* maint: (35 commits) config.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL imap-send.c: guard config parser from value=NULL wt-status.c: guard config parser from value=NULL setup.c: guard config parser from value=NULL remote.c: guard config parser from value=NULL merge-recursive.c: guard config parser from value=NULL http.c: guard config parser from value=NULL help.c: guard config parser from value=NULL git.c: guard config parser from value=NULL diff.c: guard config parser from value=NULL convert.c: guard config parser from value=NULL connect.c: guard config parser from value=NULL builtin-tag.c: guard config parser from value=NULL builtin-show-branch.c: guard config parser from value=NULL builtin-reflog.c: guard config parser from value=NULL builtin-log.c: guard config parser from value=NULL builtin-config.c: guard config parser from value=NULL builtin-commit.c: guard config parser from value=NULL builtin-branch.c: guard config parser from value=NULL ...
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 3e10feb..f9bdb16 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -333,7 +333,7 @@ branch.autosetupmerge::
so that linkgit: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.
+ and `--no-track` options. This option defaults to true.
branch.<name>.remote::
When in branch <name>, it tells `git fetch` which remote to fetch.