From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.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 aJ/OJOJtn2LI3gAAbAwnHQ (envelope-from ) for ; Tue, 07 Jun 2022 17:25:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id uIOLJOJtn2I5HgEAauVa8A (envelope-from ) for ; Tue, 07 Jun 2022 17:25:22 +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 68F5BDC3A for ; Tue, 7 Jun 2022 17:25:17 +0200 (CEST) Received: from localhost ([::1]:46262 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyb52-0003ql-5y for larch@yhetil.org; Tue, 07 Jun 2022 11:25:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyb43-0003ou-Du for emacs-orgmode@gnu.org; Tue, 07 Jun 2022 11:24:16 -0400 Received: from ciao.gmane.io ([116.202.254.214]:51796) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyb41-0005ES-HX for emacs-orgmode@gnu.org; Tue, 07 Jun 2022 11:24:15 -0400 Received: from list by ciao.gmane.io with local (Exim 4.92) (envelope-from ) id 1nyb3y-0009zS-Sp for emacs-orgmode@gnu.org; Tue, 07 Jun 2022 17:24:10 +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: Tue, 7 Jun 2022 22:24:02 +0700 Message-ID: References: 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: 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, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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=1654615517; 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=6E6FYjx17NpvcLQP1xDYyxwNIlOEoSvukcE4xFyoeNQ=; b=GUfZZGH9Co/W7RVvEYD9mFQG4LRCuHY9QbwwAh4xEGxL4OGqjgn7GNn+Cfzo2htqi0fIjX LNfUmIyYtEHLdoomgxKnIs4YrKiJipqXdNDHY38e/MQO3w8gw7GJw8ilhohdZkgnDKzv+8 +tcq16al3psxIfUQAoqm5Rg4xmK+C+HJQ0aaoVWe8ZYpsgqI7myg3h58MenG8HvLX51Ynb 5Taqs22Aud7leCE3DKJrX6IA2ArC+X8XhPO9wjSRWbojflLdfg3YZ3tXUW5K3dNP/3Ep9D aHo600erlJnfdLXiq16kValU6g4DyyfdieuC2kJsZqS5njJSnkFsCAfQdi+AwA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654615517; a=rsa-sha256; cv=none; b=nTJtHjmx4QZyEvtr/iW4NeVfFBG4G11qQkaqUcdOAvtf0rG7PYay5bmG9JcMlNOAsV/lzr inQSlPOn2X285HJ1rqn4hZIMQYr6tzK+VOIQLw+TDNBtPATjtEgpN4EvL3b5CHVVCawW8t iPWzTQ62H7hKUDBxupbBgv+l9oIrrxLjo5654T6Qgt3CyNZgSwWS7tnJ7Dov4CHQG9PrqV od9fdY2NXCjlaD08k/DAa/k542TEhoQpgiK0HATtpiF/kLZ/6Y7iqVC5B7vebIp+R+Kq+z +xpF7cfv1fTIzqGncMfTvDv2KxrbnrKVThH2DKjBZnzVoQvE0yXw3CMwefomxw== 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: 2.39 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: 68F5BDC3A X-Spam-Score: 2.39 X-Migadu-Scanner: scn0.migadu.com X-TUID: 1baqYJVvC6LZ On 07/06/2022 10:33, Samuel Wales wrote: > > 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? The state of your local repository is unclear for me. Maybe git remove -v show git branch -r -v will shed some light. maint branch existed in the repository hosted at orgmode.org. During migration to savannah it was renamed to bugfix, so if earlier you rebased local branches onto maint as the release branch, you should use bugfix (from savannah) now. Your "local" branch has "rebase" setting, I am unsure concerning its precise meaning. I usually do not set any remote for local branches and explicitly specify target commit every time I need to rebase them. > do i do git branch -m bugfix in my maint branch This renames just your local branch but should not affect its association with remote (orgmode.org) branch. From my point of view it just increases confusion. Add new remote, checkout bugfix branch (it will track the branch from proper remote repository), then rebase your local modifications onto bugfix. You can use "git rebase REMOTE/bugfix" (I do not know your remote names, replace REMOTE to the name of the savannah repository). Target branch name for rebase is no more than convenient way to specify particular commit.