From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id wMvbB0TOUGGE+QAAgWs5BA (envelope-from ) for ; Sun, 26 Sep 2021 21:47:16 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +FvRAkTOUGENVAAAbx9fmQ (envelope-from ) for ; Sun, 26 Sep 2021 19:47:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 629592F9A9 for ; Sun, 26 Sep 2021 21:47:15 +0200 (CEST) Received: from localhost ([::1]:52630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mUa7G-0006Gq-EF for larch@yhetil.org; Sun, 26 Sep 2021 15:47:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mUa6F-0006E3-7G for emacs-orgmode@gnu.org; Sun, 26 Sep 2021 15:46:11 -0400 Received: from mail-lf1-x135.google.com ([2a00:1450:4864:20::135]:34514) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mUa6D-00060T-FK for emacs-orgmode@gnu.org; Sun, 26 Sep 2021 15:46:10 -0400 Received: by mail-lf1-x135.google.com with SMTP id g41so67050122lfv.1 for ; Sun, 26 Sep 2021 12:46:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=YGlGkAWhzlbAkdS1BEmEBEPbp29z+lfipX0in0OPe2A=; b=R6kbHn9l8dP5rq0ootegicil2RA4CJxe1i88VkEj6tKDaYFpTtHsiwlekRF5fV+ZAL X34690m4K3x7kg6NSZrsEPYq1CnNlpaVq+TGWZmJtbrnuCpPW0WvClmbSIeXqPke3i1H CPKLar0xrW9r4vgnqwfdLckNThJHJY7EmtHYzPy9/2abqA6B9U34BukRFB3f7cs/Hiu/ m93sREPYwPdM2JGleTEltkQ8JsCBl8ZB2I+qHdVthDB8dk0/GgIWhCGoGgPyD7/sqwMa KxIP3HFgT9EE9QhYzeFspvcXr8xgH6k+NlzXGfol3jjLZ51EXan5xkL9L7nx5FaaCWsQ 6sHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=YGlGkAWhzlbAkdS1BEmEBEPbp29z+lfipX0in0OPe2A=; b=eA337HispE8z4r79UGSL2SfFlHdB2DVrMgPGBvTTDoctdlQhxHf1LAMfad0IhDp/3X vjLTpG+iuiXbCvO99kjhdOTd/ohRHww5JFVYf391gLmZdoeYV2G/ObPPUhpodl0nQ7Lt SUqejPWiaGQGVjmau8GvUgK816TO86FX0KQaiU+hLaNNZ/Dj391fQIvT7DzZqkU6qh0+ SMVKpcNwKicTH0jkCZbrgYauziLVN2381nognOqiiwTR0Vqzy4rvtwz4BRYg86HKNkO6 jv74VegKxredx++kNDQJ8R/NO51VJlneKF8l1D+hhBKfx5Mq0LzPge4J/5tVAtYmdXki buVg== X-Gm-Message-State: AOAM530ufCw4i5wSckpa9KuFKcpDAiDNbSD/FMLPLkT3TpVE+xdayJPe 7ETehBM/HQ7esdeWyDJzLUC2lxaEBiMeMapvVKQ= X-Google-Smtp-Source: ABdhPJzNMJeviyIkNYPQzp2BDRpol432sBGjShr+Bfg8Zafr9VdncT63wDAChFzhJOsnEDHa6BmVbTCY5T/6CEEBlw4= X-Received: by 2002:a2e:a595:: with SMTP id m21mr23131507ljp.51.1632685566706; Sun, 26 Sep 2021 12:46:06 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a05:6504:50a6:0:0:0:0 with HTTP; Sun, 26 Sep 2021 12:46:05 -0700 (PDT) In-Reply-To: References: <87k0j3eir3.fsf@gmail.com> <87ee9bbpc9.fsf@gnu.org> From: Samuel Wales Date: Sun, 26 Sep 2021 12:46:05 -0700 Message-ID: Subject: Re: Org branches: master, main, and maint? To: Max Nikulin Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::135; envelope-from=samologist@gmail.com; helo=mail-lf1-x135.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emacs-orgmode@gnu.org Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1632685635; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=YGlGkAWhzlbAkdS1BEmEBEPbp29z+lfipX0in0OPe2A=; b=FRCD1C7ftxpRbGOgW0/GuFceeuwYKg9Ay9fw5Rth9TUrGyPrFOU6m0vbJKI+2GiYpNyYFF /xu2/gtt3+AEhK2nF0+E/jmAfuh1Yymk6xuTVb7cfogtnCpw8NRhf/3/w6JeSOKCkT1FiC yWbI6tKBAz8LhFxPWhOdPueST/kt+XymH4Oo42qQRWBFK5ess7vDaRpprjRCvaM68AGwUm aYM5aGcAYKr5W717Fqy/1Mh7DUPBnnypDDWhaB6bhqiQDLYYPQDY69UggO/jVMgZJGJCDN SlNaOpFdFfH6SGl3z0m0COELrWp8NqAq7nvWU4NdAFCnswvawHPnH9Q+8q9/nw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1632685635; a=rsa-sha256; cv=none; b=iPh5RXC+oRgFWt2GwmaJgsZSxm4TTNq3NiSde1lJJluIzcWWOwpZmHd97u7n52w0zjtVuF dUpiBaC///45T9bacPaRzvTRsxKFD1jlOpqb0yr0IFZ05k2pXSGrzv9ulEkFt5g5JMYwGX FvfS5kjlkrjnQLHs0rNDbLoQMT6d2qwGjZLNf0quQpQXx6Tk8Vw7D6dJhxv4fYplrpFY+B vYqeRBnnKSg9p5a1lOQniZAw8Y3cPBZHpq1tAkX6w5S9bAgE+7EYvITqp+toMDHcm72A4T tKeh4xo82jZpSqcHVMYCEmbbFDAvCwEIoTyinhE2WVuJeV5eL1BJDNUoUIc0Dg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=R6kbHn9l; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -2.09 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=R6kbHn9l; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 629592F9A9 X-Spam-Score: -2.09 X-Migadu-Scanner: scn0.migadu.com X-TUID: G8hDb+Rfds2i i have forgotten all my non-basic git, so i guess i am in for a bunch of figuring out the automatic rebase of my stuff on top of upstream. perhaps i can do a single git clone, do the rebase, and then change branches to create the ohters. but i presume this is a normal git thing git clone to get rid of stuff lying around, deal with tags, and deal with branches? if there is documentation perhaps say that bugfix ~=3D stable? On 9/26/21, Max Nikulin wrote: > On 26/09/2021 17:31, Bastien wrote: >> Timothy writes: >> >>> I=E2=80=99ve just had a look at the branches, and I see that we current= ly >>> have >>> >>> master >>> main >>> maint >> >> You probably listed your local branch with "git branch -a" or by >> checking your .git/config file. >> >> If you clone a fresh repo like this: >> >> ~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git >> >> and fetch all the branches (git fetch --all) you should only see >> the three branches mentioned above. > > git fetch --prune > > might help to keep personal local branches but to remove non-existing > remote ones if you changed URL of origin repository. I renamed old > "origin" and added new one with savannah URL, so each repository has its > own branch (That is why I may be a bit wrong concerning exact behavior > of --prune in this case). > > > --=20 The Kafka Pandemic Please learn what misopathy is. https://thekafkapandemic.blogspot.com/2013/10/why-some-diseases-are-wronged= .html