From nobody Thu Sep 07 19:03:23 2023 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 4RhTD84vZ3z4s2hy for ; Thu, 7 Sep 2023 19:03:36 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (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 4RhTD83JYlz3Txr for ; Thu, 7 Sep 2023 19:03:36 +0000 (UTC) (envelope-from asomers@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-3a76d882080so910983b6e.2 for ; Thu, 07 Sep 2023 12:03:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694113415; x=1694718215; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=og7HRlUaYuQP9dngVqs0chc+tr0t80M2tYt6DtIdxmk=; b=oxy2NGvMpi3MEGLEkGdQ5uOgkVwMc4xYd366++PkVrnTcBEyso4hwNtEa2o/6sIPIa a1UyPOTuC3TcOG34kpS2in3skcg9u9WbQPrX+oeZEXDb20cGOfwUvysK0O8QDjsDFRd9 e5OS/Ps2TQ0pFFKoaTEv1P8n25j/Q1eG7IfJXKM0E1DA40bjUDbOn7Fntw7lgv4u9+Lu 6k8VnDCpvfGAtTKC8PPhN0LpTxkThr9Uiw9gYCsTCUIa208lWM9xxhj6gGskvwV4A67w R8oJeKVrqXIi/K3mN7ymgIpWIIAZsKA2f5e7PRzGJEh5ZiFqxRG4qkAw9KymJkpQYvna QJsg== X-Gm-Message-State: AOJu0Yw2/Gw1sxZkwdxxIcGrMBgUZTGuWRjsRMx/lzARFJYFYFHviTqf e28h3qfEFkQ/Yz9ZGEVd+1CoUXpuas/bLWIScSs= X-Google-Smtp-Source: AGHT+IGBb39C0s0KMWrIsger81K5swlZXWF/zwiQ2pPikRKTDD9AF9FjW9rAa2a9cEF/4qKWl2edSg8Yt8oN3Q206i4= X-Received: by 2002:a54:4e1b:0:b0:3a7:541c:805c with SMTP id a27-20020a544e1b000000b003a7541c805cmr391232oiy.24.1694113415335; Thu, 07 Sep 2023 12:03:35 -0700 (PDT) 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 References: <7e6a3a98-80a8-c787-fda5-65e924dbad34@gmail.com> In-Reply-To: <7e6a3a98-80a8-c787-fda5-65e924dbad34@gmail.com> From: Alan Somers Date: Thu, 7 Sep 2023 12:03:23 -0700 Message-ID: Subject: Re: Working with forks To: Graham Perrin Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4RhTD83JYlz3Txr On Thu, Sep 7, 2023 at 11:49=E2=80=AFAM Graham Perrin wrote: > > With a clone of e.g. https://github.com/freebsd/freebsd-src.git (in the F= reeBSD project) as a starting point: when the times come to work, locally, = with other people's forks, does Git (at the command line) allow an easy way= to temporarily use the same local directory? I do this all the time, if I understand the question correctly. You just need to add a separate git remote for each fork. For example, this sequence of commands will clone the FreeBSD source. Then it will fetch grahamperrin's fork. Then it will checkout a copy of grahamperrin's feature branch. Finally, it will rebase that feature branch onto a branch from the original FreeBSD repo. git clone git@github.com/freebsd/freebsd-src.git cd freebsd-src git remote add grahamperrin git@github.com/grahamperrin/freebsd-src.git git fetch grahamperrin git branch grahamperrin/featureX featureX git checkout featureX git rebase origin/stable/13