From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.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 gBnNDNoPoWKhbQAAbAwnHQ (envelope-from ) for ; Wed, 08 Jun 2022 23:08:42 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id GDbSDNoPoWLQYwAA9RJhRA (envelope-from ) for ; Wed, 08 Jun 2022 23:08:42 +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 BB1B7C99E for ; Wed, 8 Jun 2022 23:08:41 +0200 (CEST) Received: from localhost ([::1]:34036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nz2uu-00056W-A9 for larch@yhetil.org; Wed, 08 Jun 2022 17:08:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nz2u7-0004xp-SA for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 17:07:51 -0400 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]:36833) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nz2u5-0004jT-2c for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 17:07:51 -0400 Received: by mail-pg1-x536.google.com with SMTP id y187so20063860pgd.3 for ; Wed, 08 Jun 2022 14:07:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=references:user-agent:from:to:subject:date:in-reply-to:message-id :mime-version; bh=cvHuUVi3C0Jr6kOh7fMoYbR7cjGWYyPa6s2coPooMhw=; b=MYi1Z8EPWEIUdIj5v1Nyd5TM6EmqVhBzosBhKiMX5979GbY0ccpnTWNjllDQhqcWZy Q+HHX43DIOauvWauhkG5G7ly8MTGlZqOq/yJoD74c8LBsmaVpvCEIci73R6AxN1jVb1j 3kwbqmPmMJCocaEH4lWrrMssrhukNO3p6jdyIb2gvH/Jk2aZGnDo+mKA+jTHMGf9z1Ew 3WK18oZZVELqRjpjJwpc2Ezse8D3OYykh8MIUmWiP00YHei+9sa/yet2899v0ClxZMfz vPHfKuH3M3cbRS2IhoYLn7ePTZPFrQzMiHaV7jxDxro4zU+SdBvCGLiOBP00Adqb3y+y W+BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:references:user-agent:from:to:subject:date :in-reply-to:message-id:mime-version; bh=cvHuUVi3C0Jr6kOh7fMoYbR7cjGWYyPa6s2coPooMhw=; b=wiBNcQOWAbVIg6yNmNSOddVTZsQlAUt6FzpwTIvWHFO9m6PgCADHjNvWYCBqxbtFJq N7Cw5fGHu9eIN7vGHLjLaE2WH8f+aiXTJjsxJCD15l0IWSR3T2rdKVCC/kF3dhMdXJQS Esu5wKXsGQ7/W1WMRwOhl4cgUo4oMFAqzeoSDU+xZDBYbrM8u6BDPvebtXd576QdakoK nday08g36zkjTo9A7qmYcEi6x1vGW5bYVKc3NSNvCs00OH5c6uqvhjnSBnw9wXCqxydg lPQXUha5MT1Z27ToUXuDrAat0NpaZr9iIAvQbh9BOpSkoG7rzaYB58ubYHqUSdJpf7/L 8jXw== X-Gm-Message-State: AOAM531tAkot4cFg2WcqyGtdXbS/QHPeic58mQ5F1+w1yzqp5UedZDpq Q8CPs1pfKE0i4yrM7aT8KF9yXmTPnQg= X-Google-Smtp-Source: ABdhPJwSazqIzb57+29QzVK624q8PW/oveG162yeY/x3NqNugN0AIWWXFKCtNsqKSgKy4k/YYBjmzQ== X-Received: by 2002:a63:1ca:0:b0:3fd:5560:93fc with SMTP id 193-20020a6301ca000000b003fd556093fcmr22201519pgb.542.1654722465396; Wed, 08 Jun 2022 14:07:45 -0700 (PDT) Received: from dingbat (2001-44b8-31f2-bb00-168a-02aa-14c7-49e4.static.ipv6.internode.on.net. [2001:44b8:31f2:bb00:168a:2aa:14c7:49e4]) by smtp.gmail.com with ESMTPSA id ji3-20020a170903324300b001635f7a54e8sm15092341plb.1.2022.06.08.14.07.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jun 2022 14:07:44 -0700 (PDT) References: <871qvzucqh.fsf@localhost> User-agent: mu4e 1.7.26; emacs 28.1.50 From: Tim Cross To: emacs-orgmode@gnu.org Subject: Re: git branch rename and git config q Date: Thu, 09 Jun 2022 06:50:51 +1000 In-reply-to: Message-ID: <87edzyeue1.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::536; envelope-from=theophilusx@gmail.com; helo=mail-pg1-x536.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=1654722521; 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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=cvHuUVi3C0Jr6kOh7fMoYbR7cjGWYyPa6s2coPooMhw=; b=BwyxO46PMxS5BoywvM3Y9b91zzVZHzmu5nV3KCKHgQ4hRlFo9E+cfr3nyJR0CZu6F6VzlG KKDw4gegfLmwTTTtkp1AsX1e9cLjj+JyyU9+syLkAKJxiCqGxsXmte73FBoWlUUSBLJjtC iKX/HMUkg79gPcIjKHVdhJzVrlRr0aTlhz/6gdrl77O78M9G9o1i4cAWtPG/IXXGedm25w /N4zBfFpfRDORqlSZ8AaHOqrgdAGg9wmDXiUTZP0v5Mq9/SLDuJQJhk9V2CQzPO5Qw1L3d kyXGw+L/GTfj7nOk/5gLtqpVVEPIuguHeZUQruJmmzTLXfAOh8n++k+9N/T3Mw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654722521; a=rsa-sha256; cv=none; b=aX0wkajCF/ozPSaUShYcNvtB3T2opnLVAPh3BiLk0LxCd+tSoA7Ag1eqwlxcWKBL5/90jZ H3rwApm8ri3PEUV2/TpQKx8NgwPZYAODJmzUBEb52XpIIbcKd2RykOXj5iEcJKJYpqovca vnXi3JMDAVSR+416zd7yKXaoCj8YNlA+QeLJbR5FlVLJccG5i2JfMHXqggNqWS+VHnX/GY FgSd7ssRdGD8oZuUea6ChRF8OwbdxENCV2gVY/5Mapiq+BF4U35bNpJqv9T3OCfBP3Qkve AJyfMKHnbt5XEoT/HroATyoqusavqmcI5dXzZpY0C9heyBz4oWhS60YQNBL5qA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MYi1Z8EP; 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: -4.00 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=MYi1Z8EP; 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: BB1B7C99E X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: XByvcT7xcPDS Max Nikulin writes: > I never used branch.*.rebase configuration. By the way, git-pull and git-config > man pages a full of warnings related to this feature. I assume that source of > configuration is > https://orgmode.org/worg/org-faq.html#keeping-local-changes-current-with-Org-mode-development > +1. I find most 'automatic' git configurations more problematic and dangerous than necessary. With a version control system, I think you want maximum manual control. With regards to the issues Samual is running into, I would say take a leaf from the hitch hikers guide to the galaxy and relax. This can actually be a lot simpler than you realise. On some levels, I think you may be over thinking it. When you do a git fetch it will pull down the new branch definitions for you and you will be able to use them as you would any branch name to do things like rebase your local branch against that branch. You can remove old remote definitions as outlined by Maxin. You can also just ignore them. You will probably want to update your automatic rebase configuration, but of course, as the old remotes are no longer being used, it probably won't have any impact even if you just leave it in place. You will just need to do the rebasing manually, which I think is a much better idea anyway. The only slight complication with the new branch names can arise if you do push data up to those branches. Do you need to do that or is your use case just as a consumer i.e. do you have write permission on the remote org git repository at savannah? If you don't need to push your changes back up, then you don't need to link your local branches with the remote branches. BTW I think Github has some pretty decent documentation about all of this and some good examples on how you connect a local branch to a remote one. You might find what they have and their examples useful.