emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Max Nikulin <manikulin@gmail.com>
To: emacs-orgmode@gnu.org
Subject: Re: git branch rename and git config q
Date: Wed, 8 Jun 2022 23:20:56 +0700	[thread overview]
Message-ID: <t7qi99$p6a$1@ciao.gmane.io> (raw)
In-Reply-To: <871qvzucqh.fsf@localhost>

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

> 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 
     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.

  reply	other threads:[~2022-06-08 16:25 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-06  4:13 git branch rename and git config q Samuel Wales
2022-06-06 16:22 ` Max Nikulin
2022-06-07  3:33   ` Samuel Wales
2022-06-07 15:24     ` Max Nikulin
2022-06-07 23:35       ` Samuel Wales
2022-06-08  2:10         ` Ihor Radchenko
2022-06-08 16:20           ` Max Nikulin [this message]
2022-06-08 20:50             ` Tim Cross
2022-06-09  0:09             ` Samuel Wales
2022-06-09  0:16               ` Samuel Wales
2022-06-09  0:23                 ` Samuel Wales

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='t7qi99$p6a$1@ciao.gmane.io' \
    --to=manikulin@gmail.com \
    --cc=emacs-orgmode@gnu.org \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).