From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id +MWvJzl/nWIFKQEAbAwnHQ (envelope-from ) for ; Mon, 06 Jun 2022 06:14:49 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id wIW8JTl/nWKFQgEAG6o9tA (envelope-from ) for ; Mon, 06 Jun 2022 06:14:49 +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 25B1CF8D7 for ; Mon, 6 Jun 2022 06:14:49 +0200 (CEST) Received: from localhost ([::1]:45116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ny48e-000303-6J for larch@yhetil.org; Mon, 06 Jun 2022 00:14:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45068) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ny47D-0002ko-VO for emacs-orgmode@gnu.org; Mon, 06 Jun 2022 00:13:20 -0400 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]:36489) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ny47B-000692-Bl for emacs-orgmode@gnu.org; Mon, 06 Jun 2022 00:13:18 -0400 Received: by mail-ej1-x62d.google.com with SMTP id s12so19355106ejx.3 for ; Sun, 05 Jun 2022 21:13:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=4rNKeVPO+gpqghELaJzpnmAed+nbQ4/5OopUto2Jtok=; b=YrrskcBc9b3K3Q7arTf99mlezDhADtBoqAq2MNqlp6YLtxvW0y6VJNwoFOBVaXRE0T 1RsDoDe69IPy3ZpEzU8bHHkNJgOcw6hWiR0iKeY8orZyLyqzYCqoC5yTD8YbN9npSoiM 8WIkGu4RoVuyx+LU7uTfyAt53O/LUqP+FcXEWYvk+eierSv7cPw6wyYGouIn58h7I2Jr +vO10K7Af/UITK9wgYJMtMk5gqgY49cpH6FFu7FcLQtssp75bEye6LZjSSjWQ03pCy8p KrvNvyrCuDTmU2odv/rH+CEFimYbxQUCK6f5TxDbWSqFWFj+7NTY4bgl03BetUGupjE2 rhDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=4rNKeVPO+gpqghELaJzpnmAed+nbQ4/5OopUto2Jtok=; b=6heUCEvU8rterqTDG98AIuuIeUeqXTS/ZONdGNgibhSWjlnx+K3Q+K26wkWKhcZyvm il+Zf9tU0tsBiyf9EYXK/yJLU5GE/Mn9WVz7RgSzInFiDkQQluk5y6I5Bew7EuBEAwyE XtChMAtryub+dbyg663x8aRP/RfjiSWH8+4wpJgDoad7r3dKDHxYBoj842Tu1n/Oq8ug S7sJwAHOyfoij0VMJ0yEowyQETzAYqqGDwkBbuhyGt8jsj4d8BW/BjDtTBX1RukZf/Yp h76R/kX2ntNtc+Ysmk9cFNOPzIfCdIW4aUbSKaVWDm/vbI0ouf8FdRjbYe75bmV41pW2 1fFA== X-Gm-Message-State: AOAM531W/VhXEXmNPYyKZBC9FFBXENdpBjnI9rvWs3l8twtQ8zJUqrW+ VAhw8wpqetbd516a/Np32ERB3+sibMhsVAWDJ+mv9sC7NYO+Tg== X-Google-Smtp-Source: ABdhPJw7PsN+CiH9AijpqIBhZN+jretpFBq8jszH9u82K2qF4yKBhNIWNeVzajqOBgxUIQufa8UncrnDIsCMcpezzpo= X-Received: by 2002:a17:906:c10:b0:6f4:6c70:b00f with SMTP id s16-20020a1709060c1000b006f46c70b00fmr19559456ejf.660.1654488794457; Sun, 05 Jun 2022 21:13:14 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:906:478b:b0:6fe:f76c:8596 with HTTP; Sun, 5 Jun 2022 21:13:13 -0700 (PDT) From: Samuel Wales Date: Sun, 5 Jun 2022 21:13:13 -0700 Message-ID: Subject: git branch rename and git config q To: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=samologist@gmail.com; helo=mail-ej1-x62d.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=1654488889; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4rNKeVPO+gpqghELaJzpnmAed+nbQ4/5OopUto2Jtok=; b=jhK5VvaEFLJq0c7GDRF4wXfB5uVoqZnENvX4ty0Sok8hS/8yh0FFIk63bSMfzkd/QtIvx/ yBiKMgs4+URSRzsN/FhaDe9soXZ9FumYm6i2eZCwIDKZZ8F8jXbzrVac2jFXHopG5g/ufj vnAujBAbGibIzVjjiv9zfkzISfW5mQF6jtXsWkYO25xlGqVfuFohyJ5LxLPPLRLG4JfKUO oZYfysLsTyTKRhyJ9TsPK7rdcSwu4SR5NOWtp5MMCNxDQSSaVeMD/4mlInAiAa3CpNWCEW 6JSxbOtbaEUN+r1zy8wOO3/bMNDmeyAXlkacfguhrrtO0C5u86oszDQO1lIQQg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654488889; a=rsa-sha256; cv=none; b=LRJqMQQx5ytHLchpg3DxTqpNit2peY8BJtE5suLOCeOQmtmQKbGilPhLlFTbjZli/bs38W hOSzRcIn7wtCwXn/+0GBY3dJ0x2lcxMQlh9hJxqd1UGU1eW1mYUBwpSZYfd3lIo6tjv6aQ YkxTSazV2liHFlurm3sxzV1kmDj3oi/Uex/scDMoAXZaG81vnQhC9ZQWypEXo+QEZ2FoA+ SkaTI/G1uASjddK7z1TVu+0IuCv1sBMWXMhSQVWIvyVfiZKei+T2bfTqkgVYdRPy3Gb4EX 3qK2n3C1YUFNddrkz1aW8mnT1HLef6uD7IcPPnN0FYb7vtAL1ZXNPzCJZ8tVnQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=YrrskcBc; 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: -2.51 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=YrrskcBc; 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: 25B1CF8D7 X-Spam-Score: -2.51 X-Migadu-Scanner: scn1.migadu.com X-TUID: ekd1LqM9qfOY org changed from master to main and maint to bugfix. this is a q related to that. for a clean repo, i figured out that i can do cd to repo, git checkout master, git branch -m main. i have a repo where i have patches that i carry along i a local branch. these are rebased automagically when i upgrade org. do i do git branch -m bugfix in my maint branch and then also /manually/ change my git config to say bugfix instead of maint in every place? and then checkout local again? will this preserve my local branch with its rebased patches? [branch "master"] remote = origin merge = refs/heads/master [branch "local"] rebase = true remote = origin merge = refs/heads/maint # merge = refs/heads/master [branch "testrelease"] remote = origin merge = refs/heads/maint [branch "maint"] remote = origin merge = refs/heads/maint this is all from many years ago. upgrading in local will nicely upgrade maint and put my patches on top in the local branch. my goal is to upgrade my repo to the latest bugfix with my patches on top and the same auto rebase setup. thanks!