aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2008-03-23 12:35:37 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-23 10:16:33 -0700
commit313da4f71c6ca89b63fc0f4bc1a8fb123bd981e2 (patch)
treef234b6e2db29a802b7c0b0182370286e78b75434
parentbc6100087cfac0293e6ccbea95a24223b724d072 (diff)
downloadgit-313da4f71c6ca89b63fc0f4bc1a8fb123bd981e2.tar.gz
git-313da4f71c6ca89b63fc0f4bc1a8fb123bd981e2.tar.xz
RelNotes: mention checkout/branch's --track option, too
checkout and branch recently learnt to track local branches when branch.autosetupmerge = always, but they _also_ learnt to do that when asked explicitely with the option "--track". Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/RelNotes-1.5.5.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/RelNotes-1.5.5.txt b/Documentation/RelNotes-1.5.5.txt
index 14beed49b..18ff82ba3 100644
--- a/Documentation/RelNotes-1.5.5.txt
+++ b/Documentation/RelNotes-1.5.5.txt
@@ -79,8 +79,9 @@ Updates since v1.5.4
* "git branch" (and "git checkout -b") to branch from a local branch can
optionally set "branch.<name>.merge" to mark the new branch to build on
the other local branch, when "branch.autosetupmerge" is set to
- "always". By default, this does not happen when branching from a local
- branch.
+ "always", or when passing the command line option "--track" (this option
+ was ignored when branching from local branches). By default, this does
+ not happen when branching from a local branch.
* "git checkout" to switch to a branch that has "branch.<name>.merge" set
(i.e. marked to build on another branch) reports how much the branch