Date: Wed, 23 Dec 2020 18:04:40 +0300 From: Lev Serebryakov <lev@FreeBSD.org> To: Michael Grimm <trashcan@ellael.org>, FreeBSD Current <freebsd-current@freebsd.org>, FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend Message-ID: <996b191c-635e-3248-c8f9-ea1b5f70507e@FreeBSD.org> In-Reply-To: <C47EED5D-2997-49FE-8D17-AD64E1317033@ellael.org> References: <CANCZdfrUsaw5jpN1ybpk0ADXdQYam0_NO0mPJd0-FMbuxPruhw@mail.gmail.com> <C47EED5D-2997-49FE-8D17-AD64E1317033@ellael.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?996b191c-635e-3248-c8f9-ea1b5f70507e>