From: Junio C Hamano <gitster@pobox.com>
To: Kalle Olavi Niemitalo <kon@iki.fi>
Cc: git@vger.kernel.org
Subject: Re: [DOC BUG] branch.autosetupmerge defaults to true, not false
Date: Mon, 11 Feb 2008 01:13:47 -0800 [thread overview]
Message-ID: <7vejbjam9g.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <87bq6nc22l.fsf@Astalo.kon.iki.fi> (Kalle Olavi Niemitalo's message of "Mon, 11 Feb 2008 10:46:58 +0200")
Kalle Olavi Niemitalo <kon@iki.fi> writes:
> 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:
Correct. 34a3e69 (git-branch: default to --track) did it
without updating the documentation.
next prev parent reply other threads:[~2008-02-11 9:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-11 8:46 [DOC BUG] branch.autosetupmerge defaults to true, not false Kalle Olavi Niemitalo
2008-02-11 9:13 ` Junio C Hamano [this message]
2008-02-11 11:27 ` Johannes Schindelin
2008-02-11 11:36 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vejbjam9g.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=kon@iki.fi \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox