[DOC BUG] branch.autosetupmerge defaults to true, not false

From: Kalle Olavi Niemitalo <hidden>
Date: 2016-06-15 22:44:12

In Git v1.5.4.1, Documentation/config.txt describes:
branch.autosetupmerge::
        Tells `git-branch` and `git-checkout` to setup new branches
        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.
However, in builtin-branch.c:
static int branch_track = 1;
...
        if (!strcmp(var, "branch.autosetupmerge"))
                        branch_track = git_config_bool(var, value);
So if the option is not listed in .git/config, then it actually
defaults to true.  A demonstration with a bit older version:

$ git --version
git version 1.5.4.rc3
$ git config --unset branch.autosetupmerge
$ git branch demo elinks.cz/master
Branch demo set up to track remote branch refs/remotes/elinks.cz/master.
$ 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help