Document that the default of branch.autosetupmerge is true

In 34a3e69 (git-branch: default to --track) the default was changed to
true, to help new git users.  But yours truly forgot to update the
documentation.  This fixes it.

Noticed by Kalle Olavi Niemitalo.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4e222f15a5b2b84eb5d55bc79c605510bd89b7b6..6d8cca46ab934826a84647cbd6e441fee286f330 100644 (file)
--- 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`
        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.
 
 branch.<name>.remote::
        When in branch <name>, it tells `git fetch` which remote to fetch.

diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index f920c04cc01e1d8a8675876adcb747f91ed86f30..7e8874acaacbd6990ccaf66d5bddbff6e4c1e5ba 100644 (file)
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -34,11 +34,11 @@ Note that this will create the new branch, but it will not switch the
 working tree to it; use "git checkout <newbranch>" to switch to the
 new branch.
 
 working tree to it; use "git checkout <newbranch>" to switch to the
 new branch.
 

-When a local branch is started off a remote branch, git can setup the
+When a local branch is started off a remote branch, git sets up the

 branch so that linkgit:git-pull[1] will appropriately merge from that
 branch so that linkgit:git-pull[1] will appropriately merge from that

-remote branch.  If this behavior is desired, it is possible to make it
-the default using the global `branch.autosetupmerge` configuration
-flag.  Otherwise, it can be chosen per-branch using the `--track`
+remote branch.  If this behavior is not desired, it is possible to
+disable it using the global `branch.autosetupmerge` configuration
+flag.  That setting can be overridden by using the `--track`

 and `--no-track` options.
 
 With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.
 and `--no-track` options.
 
 With a '-m' or '-M' option, <oldbranch> will be renamed to <newbranch>.


@@ -108,10 +108,11 @@ OPTIONS
        Set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Use this if you always
        pull from the same remote branch into the new branch, or if you
        Set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Use this if you always
        pull from the same remote branch into the new branch, or if you

-       don't want to use "git pull <repository> <refspec>" explicitly.  Set the
-       branch.autosetupmerge configuration variable to true if you
+       don't want to use "git pull <repository> <refspec>" explicitly.
+       This behavior is the default.  Set the
+       branch.autosetupmerge configuration variable to false if you

        want git-checkout and git-branch to always behave as if
        want git-checkout and git-branch to always behave as if

-       '--track' were given.
+       '--no-track' were given.

 
 --no-track::
        When a branch is created off a remote branch,
 
 --no-track::
        When a branch is created off a remote branch,

diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 584359ff3fdc4167b4af404ab92d34d3a057033c..b4cfa044bbb969add6f434070a8666fc0c325d15 100644 (file)
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -52,10 +52,11 @@ OPTIONS
        set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Use this if you always
        pull from the same remote branch into the new branch, or if you
        set up configuration so that git-pull will automatically
        retrieve data from the remote branch.  Use this if you always
        pull from the same remote branch into the new branch, or if you

-       don't want to use "git pull <repository> <refspec>" explicitly.  Set the
-       branch.autosetupmerge configuration variable to true if you
+       don't want to use "git pull <repository> <refspec>" explicitly.
+       This behavior is the default.  Set the
+       branch.autosetupmerge configuration variable to false if you

        want git-checkout and git-branch to always behave as if
        want git-checkout and git-branch to always behave as if

-       '--track' were given.
+       '--no-track' were given.

 
 --no-track::
        When -b is given and a branch is created off a remote branch,
 
 --no-track::
        When -b is given and a branch is created off a remote branch,