From 9cb3917f7e52cd927c582c4aa754a6855297303d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 12 Jul 2007 06:45:37 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc0-101-gd972c --- config.txt | 5 +---- git-checkout.html | 7 +++---- git-checkout.txt | 5 ++--- git-config.html | 7 ++----- 4 files changed, 8 insertions(+), 16 deletions(-) diff --git a/config.txt b/config.txt index aeece848a..4b67f0adf 100644 --- a/config.txt +++ b/config.txt @@ -309,10 +309,7 @@ branch.autosetupmerge:: so that gitlink: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 can have values - 'false' (never touch the configuration), 'all' (do this - for all branches), or 'true' (do this only when - branching from a remote tracking branch), and defaults to 'true'. + and `--no-track` options. This option defaults to false. branch..remote:: When in branch , it tells `git fetch` which remote to fetch. diff --git a/git-checkout.html b/git-checkout.html index ac5f81603..a400d6f6c 100644 --- a/git-checkout.html +++ b/git-checkout.html @@ -334,9 +334,8 @@ working tree.

set up configuration so that git-pull will automatically retrieve data from the remote branch. Set the branch.autosetupmerge configuration variable to true if you - want git-checkout and git-branch to behave as if - --track were given when you branch from a remote - tracking branch. + want git-checkout and git-branch to always behave as if + --track were given.

@@ -539,7 +538,7 @@ $ git add frotz diff --git a/git-checkout.txt b/git-checkout.txt index 82929523c..818b720b9 100644 --- a/git-checkout.txt +++ b/git-checkout.txt @@ -52,9 +52,8 @@ OPTIONS set up configuration so that git-pull will automatically retrieve data from the remote branch. Set the branch.autosetupmerge configuration variable to true if you - want git-checkout and git-branch to behave as if - '--track' were given when you branch from a remote - tracking branch. + want git-checkout and git-branch to always behave as if + '--track' were given. --no-track:: When -b is given and a branch is created off a remote branch, diff --git a/git-config.html b/git-config.html index 8dbcb06f7..f931bb5cb 100644 --- a/git-config.html +++ b/git-config.html @@ -1060,10 +1060,7 @@ branch.autosetupmerge so that 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 can have values - false (never touch the configuration), all (do this - for all branches), or true (do this only when - branching from a remote tracking branch), and defaults to true. + and --no-track options. This option defaults to false.

@@ -1842,7 +1839,7 @@ transfer.unpackLimit -- 2.26.2