From owner-freebsd-current@freebsd.org Wed Dec 23 15:09:08 2020 Return-Path: Delivered-To: freebsd-current@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 0C3DE4C1E18; Wed, 23 Dec 2020 15:09:08 +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 4D1Gnb6s8Zz3GC9; Wed, 23 Dec 2020 15:09:07 +0000 (UTC) (envelope-from lev@FreeBSD.org) Received: from onlyone.not-for.work (onlyone.not-for.work [148.251.9.81]) (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 C4C71265D9; Wed, 23 Dec 2020 15:09:07 +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 20A9B6176; Wed, 23 Dec 2020 18:09:05 +0300 (MSK) Reply-To: lev@FreeBSD.org Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend From: Lev Serebryakov To: Michael Grimm , FreeBSD Current , FreeBSD-STABLE Mailing List References: <996b191c-635e-3248-c8f9-ea1b5f70507e@FreeBSD.org> Organization: FreeBSD Message-ID: Date: Wed, 23 Dec 2020 18:09:05 +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: <996b191c-635e-3248-c8f9-ea1b5f70507e@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2020 15:09:08 -0000 On 23.12.2020 18:04, Lev Serebryakov wrote: > On 23.12.2020 17:32, Michael Grimm wrote: > >> git-branch(1): >>         With a -m or -M option, will    be renamed to . If > ==============================================^^^^^^^^^^^^^^^^^^^^ >>         had a corresponding reflog, it is renamed to    match >>         , and    a reflog entry is created to remember the branch >>         renaming. If     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! I'm idiot today, it is `git checkout ` of course. -- // Lev Serebryakov