emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: Ihor Radchenko <yantar92@gmail.com>
To: Samuel Wales <samologist@gmail.com>
Cc: Max Nikulin <manikulin@gmail.com>,  emacs-orgmode@gnu.org
Subject: Re: git branch rename and git config q
Date: Wed, 08 Jun 2022 10:10:14 +0800	[thread overview]
Message-ID: <871qvzucqh.fsf@localhost> (raw)
In-Reply-To: <CAJcAo8v6iaZMi8=2MTUfJvwcCahzEEUT8JxpY9LXDx6B6UUHmw@mail.gmail.com>

Samuel Wales <samologist@gmail.com> 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

next prev parent reply	other threads:[~2022-06-08  2:11 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 [this message]
2022-06-08 16:20           ` Max Nikulin
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:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  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=871qvzucqh.fsf@localhost \
    --to=yantar92@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=manikulin@gmail.com \
    --cc=samologist@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

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