From owner-freebsd-stable@freebsd.org  Wed Dec 23 15:04:44 2020
Return-Path: <owner-freebsd-stable@freebsd.org>
Delivered-To: freebsd-stable@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id AF2EF4C17B7;
 Wed, 23 Dec 2020 15:04:44 +0000 (UTC) (envelope-from lev@FreeBSD.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "smtp.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4D1GhX4ddGz3Fv8;
 Wed, 23 Dec 2020 15:04:44 +0000 (UTC) (envelope-from lev@FreeBSD.org)
Received: from onlyone.not-for.work (onlyone.not-for.work
 [IPv6:2a01:4f8:201:6350::2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 (Authenticated sender: lev/mail)
 by smtp.freebsd.org (Postfix) with ESMTPSA id 739F9273EF;
 Wed, 23 Dec 2020 15:04:44 +0000 (UTC) (envelope-from lev@FreeBSD.org)
Received: from [192.168.23.230] (unknown [89.113.128.32])
 (Authenticated sender: lev@serebryakov.spb.ru)
 by onlyone.not-for.work (Postfix) with ESMTPSA id 4A80F6173;
 Wed, 23 Dec 2020 18:04:41 +0300 (MSK)
Reply-To: lev@FreeBSD.org
Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend
To: Michael Grimm <trashcan@ellael.org>,
 FreeBSD Current <freebsd-current@freebsd.org>,
 FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org>
References: <CANCZdfrUsaw5jpN1ybpk0ADXdQYam0_NO0mPJd0-FMbuxPruhw@mail.gmail.com>
 <C47EED5D-2997-49FE-8D17-AD64E1317033@ellael.org>
From: Lev Serebryakov <lev@FreeBSD.org>
Organization: FreeBSD
Message-ID: <996b191c-635e-3248-c8f9-ea1b5f70507e@FreeBSD.org>
Date: Wed, 23 Dec 2020 18:04:40 +0300
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101
 Thunderbird/78.6.0
MIME-Version: 1.0
In-Reply-To: <C47EED5D-2997-49FE-8D17-AD64E1317033@ellael.org>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-stable>, 
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Dec 2020 15:04:44 -0000

On 23.12.2020 17:32, Michael Grimm wrote:

> git-branch(1):
>         With a -m or -M option, <oldbranch> will	be renamed to <newbranch>. If
==============================================^^^^^^^^^^^^^^^^^^^^
>         <oldbranch> had a corresponding reflog, it is renamed to	match
>         <newbranch>, and	a reflog entry is created to remember the branch
>         renaming. If <newbranch>	exists,	-M must	be used	to force the rename to
>         happen.
> 
> I don't understand that text completely, because I don't know what a reflog is, yet ;-)
> 
> Thus: Should I use "-m" or "-M" in my scenario when switching from stable/12 to stable/13 in the near future?
You should not use any options if you want to switch your working copy to new branch. `-m` and `-M` *renames* branch!

-- 
// Lev Serebryakov