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 mD3uNk0FoGIuawEAbAwnHQ (envelope-from ) for ; Wed, 08 Jun 2022 04:11:25 +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 UOroNk0FoGKwZwEA9RJhRA (envelope-from ) for ; Wed, 08 Jun 2022 04:11:25 +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 806A7DD79 for ; Wed, 8 Jun 2022 04:11:25 +0200 (CEST) Received: from localhost ([::1]:56824 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nylAK-00039K-Dc for larch@yhetil.org; Tue, 07 Jun 2022 22:11:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyl8e-00039A-8e for emacs-orgmode@gnu.org; Tue, 07 Jun 2022 22:09:40 -0400 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]:37501) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyl8c-0006yG-Jb for emacs-orgmode@gnu.org; Tue, 07 Jun 2022 22:09:39 -0400 Received: by mail-pj1-x1031.google.com with SMTP id 3-20020a17090a174300b001e426a02ac5so19347070pjm.2 for ; Tue, 07 Jun 2022 19:09:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:in-reply-to:references:date:message-id :mime-version; bh=RBFG+jynvQ3pDRYYvN3DmFUMH+5X/J2i1E0oUB1pFsc=; b=JIV5r8HFjtXea/sH9s9gIdZR90CN/CEeSoHrMhHC4i6wYV9PU1HarHuDFBU9ZfymhZ 8IwHswtIJzP8v9F/t2U0dLjSOIzzXMzYo5yda0wg+X7AireqXUm+6lnRF2w5DnXC/+zZ nC2wP206xmf2NWGixbk/5B20/d6cHqWiaOkNaHdF53rBT1115PkDCnegz6Lhv0Ekhxw2 qGWL5mw/YiUcxITi2e+2HoaV9SaUgyG1Y2VAZ33YCwZDJJ4CG2TQyD3iutEEJWSa0j1H 1XHDpg44FzitNy3K30SiiPjX86eDY0F1pCGXDzbC6+9FmEKPrqo/IzrhCZ9XyqzrRDwB 7swQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:in-reply-to:references:date :message-id:mime-version; bh=RBFG+jynvQ3pDRYYvN3DmFUMH+5X/J2i1E0oUB1pFsc=; b=rbi2lHYZ16pnF0urEMv0dBsav84SxIqeIlPtQFSwQiNRxgdpFGy+uWlPTik1TBt38Q eBRro/3t5MnNJu9vmDk3nC40C+nRDgLVHn6M2mSsNyY9JG9bCYZ/+Lh22U692K/MqRmk zsxG4n9QqsokZaUJcO02EqJdnlpzq8qWbinQuvBA88WOnVNnobj95RJYmgc0n0WtEXRW dPFKxB8hZAh0tEACHjYJLPw8WWGO5I7tnaqJpFzC4s2mUDv0S5RT7rti64ZY1SwaITIP Pjs64ybvkhGlBueur1pXzZO2mQ7tX5V+Urad8li7dLP6IdmLQ6tCuPza/oZmvL1Mrj9Q 0X/g== X-Gm-Message-State: AOAM532vlU70+oQrBUuWjfeUoBugSeHDUH52kBPDT5S6Ig1dXndZQ17g I/m6a5DiFMbUOa5ivo/Jxgk= X-Google-Smtp-Source: ABdhPJxkTprSaYmT4z+Do1XZ2A2exw+VTI0bnnG5WBqhg8irG1pGFDtsQtaFJZxOs/R+Wde5GxyU+Q== X-Received: by 2002:a17:903:230b:b0:167:5310:9eed with SMTP id d11-20020a170903230b00b0016753109eedmr23235320plh.46.1654654177116; Tue, 07 Jun 2022 19:09:37 -0700 (PDT) Received: from localhost ([64.32.23.62]) by smtp.gmail.com with ESMTPSA id d13-20020a170902654d00b001663185e654sm12424881pln.280.2022.06.07.19.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 19:09:36 -0700 (PDT) From: Ihor Radchenko To: Samuel Wales Cc: Max Nikulin , emacs-orgmode@gnu.org Subject: Re: git branch rename and git config q In-Reply-To: References: Date: Wed, 08 Jun 2022 10:10:14 +0800 Message-ID: <871qvzucqh.fsf@localhost> MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=yantar92@gmail.com; helo=mail-pj1-x1031.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 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_ENVFROM_END_DIGIT=0.25, 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=1654654285; 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=RBFG+jynvQ3pDRYYvN3DmFUMH+5X/J2i1E0oUB1pFsc=; b=WfkUzn2yVkZuYcuTY/GuQkOHrT6YeBEI2RtxMsHbQOQZ/NwUvenMW37ZP8vu7BUOFtRl4V kyr+9Qo7UCCv3S7VX756/9EIX0JOyD/BapTUMU/lNWM8Oc6ZxeZ+fuvERGhMoyDQ7KWH6I qnlO8Cnp54YvQekpCIXuMsfkleQs/cc0NxfDJ5Z09FD4/rcbZZ7kROzzkZQ2PksPofvcjn 2d7UdpurrKrwUa78hdBiXi5JRhGCopOJEOJvn5Jcy889OvLHk7lWXbh+2XuUchyTRIaYeh p9Fn7LVQnt9uTKoibkrwGtr6woXpPfRyfxgz1MfGbmiNAr7o0gNb59BJg8MSLA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654654285; a=rsa-sha256; cv=none; b=ms5DhTPgoDlYsRSbXbDyuaHozHcVAb9Pgqx4ahCpKbhh3vHdDEK/F9R2JDFx42aUWGRx2G ZV1dMHndWFyfF/lEFxVYM5tRga0Dp9UtTJ7VEskzPFOkbFEcAF2G0pRc/kf2RPkBcPelDH cYESV7nv/O/T0QZZqqU9ZonYz9GBtbebdO3tZLEGoFMqkVwwy5E47iN02KCx+IhJ6Kjz4O Qi/e2MsHPksX9Tbd7Iqnjor36t50kgeDXdYOyfPdet5SShoauWop81Oa9Y47CLcFGnqZcu z5ceg95LaRJFnwmE+XoB1/SE0VYe90s9x7XKLUAEzewDzA0s3wjkz4J1SaO7iQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JIV5r8HF; 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: -8.80 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JIV5r8HF; 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: 806A7DD79 X-Spam-Score: -8.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: RZDMTkllbcP0 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. 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. Best, Ihor