[PATCH 3/7] Documentation: clarify track/no-track option.
From: J. Bruce Fields <hidden>
Date: 2016-06-15 22:43:04
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
From: J. Bruce Fields <bfields@pad.(none)> Fix the description of the --no-track option so it no longer says the opposite of what was intended. Also mention branch.autosetupmerge explicitly. Signed-off-by: "J. Bruce Fields" <redacted> --- Documentation/git-checkout.txt | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index 2ead493..337b3d5 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt@@ -49,13 +49,17 @@ OPTIONS --track:: When -b is given and a branch is created off a remote branch, - setup so that git-pull will automatically retrieve data from - the 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 + '--track' were given. --no-track:: When -b is given and a branch is created off a remote branch, - force that git-pull will automatically retrieve data from - the remote branch independent of the configuration settings. + set up configuration so that git-pull will not retrieve data + from the remote branch, ignoring the branch.autosetupmerge + configuration variable. -l:: Create the new branch's ref log. This activates recording of
--
1.5.1.1.98.gedb4f