Date: Fri, 2 Dec 2022 18:30:32 -0800 From: Bakul Shah <bakul@iitbombay.org> To: Graham Perrin <grahamperrin@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: git-switch(1) then git-pull(1) Message-ID: <48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD@iitbombay.org> In-Reply-To: <db9ddb93-c40f-8c3d-7cf3-5a7342255193@freebsd.org> References: <ef399d4c-cb26-2bff-9966-684d3a7b96ad@freebsd.org> <CAFDf7UJWWHKqAGFWdQHfXTH=H=c0vF1pf1X%2BZO78iDtiL3E=cg@mail.gmail.com> <db9ddb93-c40f-8c3d-7cf3-5a7342255193@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Dec 2, 2022, at 5:19 PM, Graham Perrin <grahamperrin@freebsd.org> = wrote: >=20 > On 02/12/2022 12:08, Nuno Teixeira wrote: >> Not sure if I understand but I use `git switch` on ports tree to = switch from 'main' to 'quarterly' to avoid having 2 trees. >>=20 >> e.g. >> When in main and need to do a commit on 2022Q4: >> `git switch 2022Q4` >> `git pull --rebase` >> `git cherry-pick -x XXX` >> `git push` >>=20 >> and switch back to main: >> `git switch -` or `git switch main` >> `git pull --rebase` >>=20 >> Hope that helps > There's the statement after the switch:=20 > "up to date" > If the branch is truly updated, then what are the subsequent updates? = (The pull immediately after the switch. The "Your branch is up to date with ..." message by git switch is confusing but upd to date is merely with respect to the local .git. It mainly changes .git/index and .git/HEAD mostly. git pull or fetch" is a separate issue.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD>