From nobody Sat Dec 03 02:30:32 2022 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NPDLs2TRgz4j8J2 for ; Sat, 3 Dec 2022 02:30:45 +0000 (UTC) (envelope-from bakul@iitbombay.org) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NPDLs0SW1z3NFQ for ; Sat, 3 Dec 2022 02:30:44 +0000 (UTC) (envelope-from bakul@iitbombay.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-x233.google.com with SMTP id q186so7166076oia.9 for ; Fri, 02 Dec 2022 18:30:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iitbombay-org.20210112.gappssmtp.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=uLCEE9ZuEomvJR4vPs38ANTmmn/6q+5s1xWDYTe1aK4=; b=l8tNsJHyd56iKCFuf5xZ2mdOtmeVuSRZJGZVgnD2Bu+XGM2hBs4sOxKAj68PmfG2/j gM+AZkCHJTgh8lvUMo2linw08nxeDdupQxnxhxWotr0F2fJUH3dleCM1CvVOGW5D9Mdd VYCSfMRN2bGvmtqeV1hj1yOgGBEORwpBgfdykPFO0vvQXs9RXOVkZc3m8qNVQ8bR74aM 5l44GSVVaTWsG1SxwcCDtHXyT7mQV+yd5Xd3ybPKw/zqAgyCX0XQI2Vi6IguHqfSlACf xSyl/cME8+xwe77t+YDOJc4DGL4gjSg4M87vR9nysnXHebsJB00rG4oHyWV+ScdjOMDN eNsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uLCEE9ZuEomvJR4vPs38ANTmmn/6q+5s1xWDYTe1aK4=; b=U+OkmQ0NGDpb60bvcVf1ub3RoPV5joeEh+S436WazYnzD2d5ihxNb4Z/4yq7rSY0fH cviwDvRbCeZyZqdwMAXJeB33SIPCPCR4AN1z9/pC2g6Q5dPO7Bcn8wsdSxcD/UTPoknY sZSdORZELxq8ayEo6i5xEsxqs1hRZX/oMtLTjqJaA/OVQbyanNtNi7MP2k4vgBXWdEdi vMKiea9cv8gknfTtvhmPMbZTb/Q7Aep1X2OXHjutuhyId1UiOPTCgCmhlBOR7vMzi2R2 P4CiX8G8RW7Q3PoXTm2i/zIJQ5im3GfDrzJkBZ7g4ociFOGo4EvhDEdm5qFirCXgy3Ev 21Tw== X-Gm-Message-State: ANoB5pnTRN8QmOMMOmi/f2KB4s04eDHO2peHSTvSFfRqHPElzIpNw4CA C8vthp0wgCgBV+4aKXQhhSRcDUXhVtpqxfuK X-Google-Smtp-Source: AA0mqf7Cx4eiKY20c4cBkpY1VPgInSu9EpynjEQlgp2blJBJ6pwL2btGkxrGXsinGJRaS/ej8pFHRg== X-Received: by 2002:aca:420a:0:b0:35b:b709:6048 with SMTP id p10-20020aca420a000000b0035bb7096048mr12727954oia.81.1670034643836; Fri, 02 Dec 2022 18:30:43 -0800 (PST) Received: from smtpclient.apple (107-215-223-229.lightspeed.sntcca.sbcglobal.net. [107.215.223.229]) by smtp.gmail.com with ESMTPSA id v12-20020a4ac00c000000b00492f9f46aa4sm3609737oop.36.2022.12.02.18.30.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 02 Dec 2022 18:30:43 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.200.110.1.12\)) Subject: Re: git-switch(1) then git-pull(1) From: Bakul Shah In-Reply-To: Date: Fri, 2 Dec 2022 18:30:32 -0800 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <48B94C3C-6383-4CF6-9B9B-5F2EDB97FACD@iitbombay.org> References: To: Graham Perrin X-Mailer: Apple Mail (2.3731.200.110.1.12) X-Rspamd-Queue-Id: 4NPDLs0SW1z3NFQ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N On Dec 2, 2022, at 5:19 PM, Graham Perrin = 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.