From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id OJvtNFTHnmJPDAEAbAwnHQ (envelope-from ) for ; Tue, 07 Jun 2022 05:34:44 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id KJjnNFTHnmKZWAAA9RJhRA (envelope-from ) for ; Tue, 07 Jun 2022 05:34:44 +0200 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 632162160D for ; Tue, 7 Jun 2022 05:34:44 +0200 (CEST) Received: from localhost ([::1]:45444 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyPzO-0002Zh-Tj for larch@yhetil.org; Mon, 06 Jun 2022 23:34:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38754) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyPyN-0002ZW-MF for emacs-orgmode@gnu.org; Mon, 06 Jun 2022 23:33:39 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:43974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyPyM-00072g-1e for emacs-orgmode@gnu.org; Mon, 06 Jun 2022 23:33:39 -0400 Received: by mail-ej1-x631.google.com with SMTP id m20so32508087ejj.10 for ; Mon, 06 Jun 2022 20:33:37 -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; bh=9/6+E2DLI3iGhXSRpRuy+O184XDT5XT2ufN+LM27DnI=; b=A55TYICofrCvAbZSuJ0nFyGvYueYEMqgRaMKI7RJTq9FYS10ZUf1QeW9KVYIimJWBa UKxv0N4hvR+pvwecOUxdiH77Zv7R1opyH3UZpGQx9pn9lGXgEOdoLRb5W/n85fXFqzjI Dg5WWKgF5ZYuDyoH0pZCHRNWowOgwRYWbCZjkVveSR7X/6cKiTXrQEbJituCKv9NUBD4 raKa+o/AEnltTyY1DQUgA+5ABKS2hEyaedRe7ANbCXQVWvkc3U9IfMrPbdXkdzjs+fQO WLdsjEbxtGQBP6Sj/3tVKyiwBfEcBQkP/ZXhIKnPtoaLkDhr7BNr/EnHhujrPyMicAWv ry8g== 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; bh=9/6+E2DLI3iGhXSRpRuy+O184XDT5XT2ufN+LM27DnI=; b=i8fbhvssSQqRKdgyux62N99tQue/aIIytMMxqeldwUaInEFG1DwHQQFWbuoNx8Y8tl ZnnfnuNIeMVjAyT5ykkdfHqRA18K64uZAGy/ti9ProC8++sD79BPcl84n9aAD97/DKyH fC1TlOLfOXkCpFF87UTumhxKDV+QEirlV+7km2cdCUNyhqEJsuUSVI+LaMNnnRNLgr5n Z0hN4vkSGl+rrmsVhGJviYU4/kWcXLosadVeI388V8grDU748LCBggwFQjFPbzFUY+1w 9X+1MJiwtTYq+QgzGu01D71VbFrFrgHnMYs94Kna0IR+/+yWLs2UOu55qFQff5wBWbxt KPDQ== X-Gm-Message-State: AOAM530MttWt6zyh8RPoG0M4igw8UO0qTlYqjjcgg/vkEEPAtDLrGWRW w3vwE4kQzlS8cmEj9wgacpLYr30T+MRVJkYDSuA= X-Google-Smtp-Source: ABdhPJxJh6U5iRbkhw1YcR+8A8t04x2SdZx1EFJMcBanU+svaHC7k47KAbeJjfnD6iVyTU5+n0xmQHnBxdYkvaz2NQc= X-Received: by 2002:a17:907:1c8a:b0:6e9:2a0d:d7b7 with SMTP id nb10-20020a1709071c8a00b006e92a0dd7b7mr24209682ejc.572.1654572816087; Mon, 06 Jun 2022 20:33:36 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:906:478b:b0:6fe:f76c:8596 with HTTP; Mon, 6 Jun 2022 20:33:35 -0700 (PDT) In-Reply-To: References: From: Samuel Wales Date: Mon, 6 Jun 2022 20:33:35 -0700 Message-ID: Subject: Re: git branch rename and git config q To: Max Nikulin Cc: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=samologist@gmail.com; helo=mail-ej1-x631.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1654572884; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9/6+E2DLI3iGhXSRpRuy+O184XDT5XT2ufN+LM27DnI=; b=hRFGkaOiN+nc0bqDyUu3GVInO0ELQCg9YOWsHgWOAQRLNXn1IP890qlQtR6k2fRLsyy83Y jhLbOf1wwvIh1j/CxCohD3kx4dkYWs3GVWhhyddSMOyf7U6gQOWrO8amEkHGlQqAxVZ95+ CnseZTut7RpycqsMz4J0IXk9h+qlFGUvHuKLyHSfttkBzSlGm4G7Dk62wiLvhUCiwssLqP R5dcsnFYzchzyS2ddGM4OQEjzL4rnpRyCRDMPKP/c4e5zhNR8wbIryOHfmWROiH8e2Xs5O Rpz/j7eOtX/nwTG8CB4etJwS8x1Ulw/eypNsbUd7adl9NQb4rNTBHVuQBH36vw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654572884; a=rsa-sha256; cv=none; b=HhEnal33WOrcdKQ/qcWJFCd49O4K2ledLRPDjbsZF2sbQugjAb8aJb5nqz4xDgL6O3jtbj Y+E6IwF6HnUlyA8WExPHrwmqftPg+XcvGl2ZtHsXr0Z99v036SRSACGyD1vyF8JOb9TZLw otFqM+h76k5BXIT5PWWl+8rRYCP0C6uAGAnv80+2a/SHcyuPpcChSV4VOfDOYCWTOd2G/3 3LJfxe+V+K0YoOMHRz1AMkFACxTrDXE7qqyTEtKo4Hr1K6M6ADxjY7SVXgLl7uskr81OTz bwAQI5i/3zCT4bmTnvxpcYuJMV69Z3RV2HgVqIUCPFsbr0+XJ7ISAQfHP90j/w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=A55TYICo; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -5.31 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=A55TYICo; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 632162160D X-Spam-Score: -5.31 X-Migadu-Scanner: scn0.migadu.com X-TUID: WVWstOwVk6kZ thanks for the links [my brain is not up to understanding atm]. when you say perhaps i do not need to rename branches, do you mean that my guess at a solution had a redundant step? and that step was manually edit config file? no need there? the last par of your email makes it seem as if i should do a git [interactive?] rebase operation from [top of] local on bugfix, even though it is already rebasing on maint each upgrade. would that be a good description of what you meant? On 6/6/22, Max Nikulin wrote: > On 06/06/2022 11:13, Samuel Wales wrote: >> >> i have a repo where i have patches that i carry along i a local >> branch. these are rebased automagically when i upgrade org. > > You may change remote for this repository. Perhaps you do not need to > rename branches. > https://list.orgmode.org/sj91nb$d9j$1@ciao.gmane.io/ > > https://git-scm.com/book/en/v2 > > > -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com