diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2008-03-23 12:35:37 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-03-23 10:16:33 -0700 |
| commit | 313da4f71c6ca89b63fc0f4bc1a8fb123bd981e2 (patch) | |
| tree | f234b6e2db29a802b7c0b0182370286e78b75434 /git-merge-one-file.sh | |
| parent | GIT 1.5.5-rc1 (diff) | |
| download | tgif-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>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions