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 4IaGA3TNoGJvIAEAbAwnHQ (envelope-from ) for ; Wed, 08 Jun 2022 18:25:24 +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 WIFaA3TNoGJMGwAA9RJhRA (envelope-from ) for ; Wed, 08 Jun 2022 18:25:24 +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 C65A23C562 for ; Wed, 8 Jun 2022 18:25:23 +0200 (CEST) Received: from localhost ([::1]:36880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyyUk-0003TO-T4 for larch@yhetil.org; Wed, 08 Jun 2022 12:25:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57278) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyyQm-00005t-IR for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 12:21:16 -0400 Received: from ciao.gmane.io ([116.202.254.214]:60430) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyyQh-0003gx-I2 for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 12:21:16 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1nyyQc-0006xT-A7 for emacs-orgmode@gnu.org; Wed, 08 Jun 2022 18:21:06 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: emacs-orgmode@gnu.org From: Max Nikulin Subject: Re: git branch rename and git config q Date: Wed, 8 Jun 2022 23:20:56 +0700 Message-ID: References: <871qvzucqh.fsf@localhost> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Content-Language: en-US In-Reply-To: <871qvzucqh.fsf@localhost> Received-SPF: pass client-ip=116.202.254.214; envelope-from=geo-emacs-orgmode@m.gmane-mx.org; helo=ciao.gmane.io X-Spam_score_int: 28 X-Spam_score: 2.8 X-Spam_bar: ++ X-Spam_report: (2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-0.001, NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=no 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=1654705523; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=rVtKRynL5FNsj6LntwpRSLv9RDHMV1EKzDbwJCVuRGc=; b=C6OcpLU24WZF5Gc1bgB8RDzVkdmfWBQN1E/+jK3oNibl9WPzbW+TvEvDI2m3SSiV+2L5tB MMjZw+tiNNa2ncP3+c0ASRBh8X9Ugj9Q8nKhdMX3eOWAbQeYAOq9qLzMOiEVYOgD9y8ybD 3IcTQbOn9j7hXMkKZATdBQB3rEsR3/ds45GkCc1+oQEaCOnv/V8LavUW1z0ja+cMWl/qsN VsKRJhbJ9XMvVI64vDLLBOnzJRvxypfnJjUNMcTh9zCpH+ubdwzSigeH8AHSDp1RXhz1Hh hEelXYoN540Fx1HzsKc/Lak1oLYl0r6i2WNjiigPT1dhyWiDaXh6tY5W8wGAnw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654705523; a=rsa-sha256; cv=none; b=HAIh4Ct3yNs2nZj2nrU51Kno6RMPohBZmGKM5gr0boqgd53hlgs9b9drI2ldhzlAH7a032 fT6E5Efg2aNuSTD9HVbmfPmAF002o8uHt773Ew7h8l8lK4mXv2LQH7Gv+ipqmWm0+hC5sj B5QLjQIKFlj6mcw377jUXi+EjR03QIsYda5du0p9Ly7jDnUZtRMYKJfLkYdBD9/IDTQ3v2 vHM2DPOhXywkS2VOLkTcJ14MMjUQDpveUccY2Q0jP+LmzzLhkYhgileELwC8ToZydMt7U7 dfjw7CEE2kK1QRPLII4B0WhlzHbaK1I0xUw6XeobxLxQiZIKkXjxxeparxwL8A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); 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: 1.90 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=gmail.com (policy=none); 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: C65A23C562 X-Spam-Score: 1.90 X-Migadu-Scanner: scn0.migadu.com X-TUID: vkYUPPyi/DsQ On 08/06/2022 09:10, Ihor Radchenko wrote: > Samuel Wales writes: > >> more confused than ever. i hoped i could just run a rename command, >> or possibly rename maint to bugfix in config. > > Max tends to go very deeply into details. 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 > For starters, you can just: > 1. Rename maint -> bugfix > 2. Rename master -> main > 3. Set origin to https://git.sv.gnu.org/emacs/org-mode.git (read-only) > 4. Set remote for the local main and bugfix branches as origin > 5. fetch the latest origin > 6. Rebase you local branches onto origin/main and origin/bugfix > > I strongly recommend using magit to work with git repos. I have not tested the following commands git remote set-url origin https://git.savannah.gnu.org/git/emacs/org-mode.git git branch --set-upstream-to=bugfix local git fetch I see no point in renaming of branches since branches with new names and proper tracking will be created on attempt to checkout. I am sorry for a type, in my previous mail it should be "git remote -v show", not "git remove -v show". You may try "git fetch --prune" to remove references to remote branches that are not existing in the repository any more.