Autogenerated manpages for v1.5.3-rc0-101-gd972c

diff --git a/man1/git-checkout.1 b/man1/git-checkout.1
index 2964559c93201fe15f5482d8aa4d26af47d2fe60..f36607505eed941c83a46675bcfdf7b490a124dc 100644 (file)
--- a/man1/git-checkout.1
+++ b/man1/git-checkout.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CHECKOUT" "1" "07/09/2007" "Git 1.5.3.rc0.81.g1ed84" "Git Manual"
+.TH "GIT\-CHECKOUT" "1" "07/12/2007" "Git 1.5.3.rc0.101.gd972c" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -31,7 +31,7 @@ Proceed even if the index or the working tree differs from HEAD. This is used to
 Create a new branch named <new_branch> and start it at <branch>. The new branch name must pass all checks defined by \fBgit\-check\-ref\-format\fR(1). Some of these checks may restrict the characters allowed in a branch name.
 .TP
 \-\-track
-When \-b is given and a branch is created off a remote branch, 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 \fI\-\-track\fR were given when you branch from a remote tracking branch.
+When \-b is given and a branch is created off a remote branch, 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 always behave as if \fI\-\-track\fR were given.
 .TP
 \-\-no\-track
 When \-b is given and a branch is created off a remote branch, set up configuration so that git\-pull will not retrieve data from the remote branch, ignoring the branch.autosetupmerge configuration variable.

diff --git a/man1/git-config.1 b/man1/git-config.1
index 902dfca0d7cbfd910a6f57f8536d07e1d73dc430..19b1ab677e1fa2171a4c21b1f967b1caa54378af 100644 (file)
--- a/man1/git-config.1
+++ b/man1/git-config.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-CONFIG" "1" "07/09/2007" "Git 1.5.3.rc0.81.g1ed84" "Git Manual"
+.TH "GIT\-CONFIG" "1" "07/12/2007" "Git 1.5.3.rc0.101.gd972c" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -388,7 +388,7 @@ apply.whitespace
 Tells git\-apply how to handle whitespaces, in the same way as the \fI\-\-whitespace\fR option. See \fBgit\-apply\fR(1).
 .TP
 branch.autosetupmerge
-Tells git\-branch and git\-checkout to setup new branches so that \fBgit\-pull\fR(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 \fIfalse\fR (never touch the configuration), \fIall\fR (do this for all branches), or \fItrue\fR (do this only when branching from a remote tracking branch), and defaults to \fItrue\fR.
+Tells git\-branch and git\-checkout to setup new branches so that \fBgit\-pull\fR(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.
 .TP
 branch.<name>.remote
 When in branch <name>, it tells git fetch which remote to fetch. If this option is not given, git fetch defaults to remote "origin".