From: Kalle Olavi Niemitalo <kon@iki.fi>
Date: Mon, 11 Feb 2008 08:46:58 GMT
Subject: [DOC BUG] branch.autosetupmerge defaults to true, not false
Message-ID: <87bq6nc22l.fsf@Astalo.kon.iki.fi>

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.
$