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>
Johannes Schindelin committed
Mar 23, 2008 at 12:35 UTC
313da4f71c6ca89b63fc0f4bc1a8fb123bd981e2
1 file changed
+3
-2
Documentation/RelNotes-1.5.5.txt
+3
-2
@@ -79,8 +79,9 @@ Updates since v1.5.4
79
* "git branch" (and "git checkout -b") to branch from a local branch can
80
optionally set "branch.<name>.merge" to mark the new branch to build on
81
the other local branch, when "branch.autosetupmerge" is set to
82
- "always". By default, this does not happen when branching from a local
83
- branch.
82
+ "always", or when passing the command line option "--track" (this option
83
+ was ignored when branching from local branches). By default, this does
84
+ not happen when branching from a local branch.
85
86
* "git checkout" to switch to a branch that has "branch.<name>.merge" set
87
(i.e. marked to build on another branch) reports how much the branch