From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 4NZZKybkn2InkwAAbAwnHQ (envelope-from ) for ; Wed, 08 Jun 2022 01:49:58 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wMwkKybkn2KSbgAAauVa8A (envelope-from ) for ; Wed, 08 Jun 2022 01:49:58 +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 2C8AD845D for ; Wed, 8 Jun 2022 01:49:58 +0200 (CEST) Received: from localhost ([::1]:46900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyixR-0004pG-00 for larch@yhetil.org; Tue, 07 Jun 2022 19:49:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyijw-0001kv-R1 for emacs-orgmode@gnu.org; Tue, 07 Jun 2022 19:36:00 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:44786) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyiju-00021l-Px for emacs-orgmode@gnu.org; Tue, 07 Jun 2022 19:36:00 -0400 Received: by mail-ej1-x632.google.com with SMTP id kq6so25139180ejb.11 for ; Tue, 07 Jun 2022 16:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=3VnZauqO734Ajx6SO/QvVj7o6wAs4yBgBogqJOY3gAQ=; b=DpNQIrWrFqIBJIBNlZWEQOm/qXjOJ6Pfbos/2YGOkcyupLZ833J/Qva+DhrvyX1Nk+ QUQyPsCLmyC/3YIqc3Iun5gsZcR9ArHd9V3xBWYBPb9v++g4TVgl1+4Sy+XxHBlNqw35 E3moEWNSMYmx3PBJ/RAW+jdBDpfFMETHIzmsuzCXPqShWngbh0TJpk+j+sQZ87dUzgP6 clcTpwSUjs1vlFE5j5Q6X0uxy3gMFmGwniNF8Ujlp8hq6rCP4Ct5K0/ZyBwjeaD4vGEQ nVKaFVPnZpv2nF4TkRfYNEfQ3ArERTVY62seC2JStB2HAJ/JFd9Ky8laVl5APzFVxuJL /evQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=3VnZauqO734Ajx6SO/QvVj7o6wAs4yBgBogqJOY3gAQ=; b=vkV74/uBhCaAZskWJ/r07TtAdD4uxFMLqIJkc45PE7Nt0HlpRq5SDWNh1+Yc5JHwWg j1vE+dlqm6bsc4OH4uN/n78Hna43mFCTQE+GSsjtaONxI+RPp8GldwXu7/GBxhTKYjBq CFUI3yJl0sskD2+TRE9NNbwzOMxffE7moOCF0kHDpgURPYPG5DdTNbLa4twcizbQdNEa xlKDM45B9QpbYdz4YwHh+fnPgGCfnf20sSuVUpq53N8etn3VE8v+JP9Hw0W7yEhpaI7u P7xmjO9shfpPuDsr6e2znO4X3bbTgftsTu6dB5OggGD/EQ9XJ7OogOy4Zc2nv+NNiR+W /8LQ== X-Gm-Message-State: AOAM532g27ZebW0eJLHfeLd67OLYAUTxX5quS3ipcTp8FZqq6WtCIMfE iHys9ZZfrPEGXfYKsN1IcstJDVv5HSJB1UvVwYgO1SFxMqTgaw== X-Google-Smtp-Source: ABdhPJz63MiqdC9qBZ0kFZcyT+x3iGYGeMuq37FSI1qcVD9bgG5jlexrxhxmpYw0vjEYioF3HkVwAjOBZRnMB1jeDis= X-Received: by 2002:a17:906:1c04:b0:708:a007:5a77 with SMTP id k4-20020a1709061c0400b00708a0075a77mr29755195ejg.566.1654644949543; Tue, 07 Jun 2022 16:35:49 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a17:906:478b:b0:6fe:f76c:8596 with HTTP; Tue, 7 Jun 2022 16:35:44 -0700 (PDT) In-Reply-To: References: From: Samuel Wales Date: Tue, 7 Jun 2022 16:35:44 -0700 Message-ID: Subject: Re: git branch rename and git config q To: Max Nikulin Cc: emacs-orgmode@gnu.org Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=samologist@gmail.com; helo=mail-ej1-x632.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=1654645798; 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=3VnZauqO734Ajx6SO/QvVj7o6wAs4yBgBogqJOY3gAQ=; b=n8PSSgHIKKiuLdhlEhhWa3yULJrITxlV1/reTZiWO+kIYLq/VWt+ZiiN4c90yAfwoTbjCS 3BUz0eNdxDA4cqyELUh/KgOr32G0uhnbKWtF/CF0Cy9SD+PxayxEfdf4A+VRb0OY5y+4Bs KOWaoquddFSPGJ7QxTr+IshGoKGx9wa67KnTw2P6g/aRtDEBogGklVgoFC/6CZ0GmnZ2WN hV5p2ApKvPO5to/NIFhlviniRcOMTIVrMzPCjiyORSkgKjDTeGZDtj+qhhUT97yQN50oDe GIB0oWu1SlIELN+dfPndE9EraD4vjVUxtBxJFVCazrhI586kYw/Iim4Lq9y2QA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1654645798; a=rsa-sha256; cv=none; b=SEiUl++sAAneIKAcZrTC0rZhjij0nIL1NuLDHjef1/37oD8hydtWJaLszFN4Yrgras9730 TSXLOUnwfv3XXZILvZrqOURVVGzX9Grgy+boHS3pMNH5VO4O+sqGxBwPwZDvlJz3bZhXDO GbQ3RbYdayobBHZbh2u4QTx5fM+jwcu/fyNr6A+RbW0pS/wpNGU/mk7lgFN5dPe6QBILw9 KSwyzE5XXfbpmWOHM4t5N9SNxj+H3L8i3COJqcweh8YQvk1TI5C5A3aP92DTl5q1JoZoGZ FcitqnmT9l1HcvuP/k/aYSq5U1VfF44V3lpm9VPpNiy7a2PLLO9DujfQ3RoU2g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=DpNQIrWr; 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: -9.00 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=DpNQIrWr; 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: 2C8AD845D X-Spam-Score: -9.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: Dq3XDeh7hvG0 more confused than ever. i hoped i could just run a rename command, or possibly rename maint to bugfix in config. there is no git remove command in my version of git. i tried remote instead. on branch local. $ git remote -v show; git branch -r -v origin https://code.orgmode.org/bzg/org-mode.git (fetch) origin https://code.orgmode.org/bzg/org-mode.git (push) origin/Globals 796952ac7 Add missing declarations in org-element origin/HEAD -> origin/master origin/backport-master 6f9184a29 Merge branch 'maint' into backport-master origin/dan-session-errors 6d28c79cc ob: python: catch errors in sessions origin/emacs-sync dd9105d17 Merge branch 'maint' into emacs-sync origin/emacs-sync-9.3.8 f7dc6be22 Backport commit 78eacf31e from Emacs origin/file-header d234a9973 ob-R: Delete duplicated function origin/file-header-alt-ui d1c50e737 working origin/fix-doc c34121c60 Documentation fix origin/hide-table-column 9655ba966 org-table: Obey cookie when aligning a table origin/km/from-emacs-master 0f7fcc9de Backport commit 6a3920c07 from Emacs origin/ledger bb1241026 babel: Use common evaluation mechanism for ledger origin/maint dcc3a84a9 keys: Re-instate some RET bindings origin/maint-quotes 08ee6c60d Backport commit 26bd978 from Emacs master branch origin/master d70f28067 org-macs: Allow for nil ffap-url-regexp origin/minted aa86ce564 org-latex.el: minor docstring clean up. origin/next 655c08dcc org-clock: Fix failing tests origin/org-7.8.50 2ddc9b60b Remove org-ascii, org-html, org-latex and org-odt origin/org-tempo 20afd5b44 ; org-tempo.el: add a missing require origin/scratch/sm/agenda-lexical 1fd7d4865 Merge branch 'master' into scratch/sm/agenda-lexical origin/stow-design 036b876f3 Bugfix: Disable typecheck if support is missing. origin/taskjuggler-export caed2af32 Merge branch 'master' into taskjuggler-export origin/tehom-html-export-refactor-build-link 76230e9f8 Re-added code to inline descriptions as images origin/tehom-master 413e6b4ee Add handling of blockquote and output formats that must be flowed. origin/top-properties c81bc4d9c Update custom properties handling origin/wip 8fd176ee7 Merge branch 'maint' into wip origin/wip-agenda-speedup f5bc563a6 org-agenda: Optimize log data processing origin/wip-cite 5af597836 org-element: Tiny fix origin/wip-cite-awe cb0085e07 WIP support for exporting citations origin/wip-cite-new b373a2f54 oc-csl: Implement `csl' citation processor origin/wip-lint 406cfbf2a org-element: Fix parsing recursive babel calls origin/wip-sitemap 1a12f3854 ox-publish: Remove :sitemap-sans-extension > 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. i followed instructions from org manual or similar long ago and it worked perfectly. it auto-rebases my patches every time i upgrade org which is what i want. that is, i am in branch local, and i pull, and git sticks the latest changes from maint on top of local for me, then sticks my patches on top of that for me. then i just make. i want to continue doing all of this. i don't want to change that workflow if possible. i know how to deal with it after many years of use. i am limited in computer use. i think that you have different workflow from me and more knowledge of git, so this is why it is confusing for me. On 6/7/22, Max Nikulin wrote: > 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. > > > -- The Kafka Pandemic A blog about science, health, human rights, and misopathy: https://thekafkapandemic.blogspot.com