emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Samuel Wales <samologist@gmail.com>
To: Max Nikulin <manikulin@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: Org branches: master, main, and maint?
Date: Sun, 26 Sep 2021 12:46:05 -0700	[thread overview]
Message-ID: <CAJcAo8uW0SYuD1Y1umyuZh=6JzQnfqcdkO0+vWQZRmm+_ZV5Jg@mail.gmail.com> (raw)
In-Reply-To: <sipm0h$89c$1@ciao.gmane.io>

i have forgotten all my non-basic git, so i guess i am in for a bunch
of figuring out the automatic rebase of my stuff on top of upstream.

perhaps i can do a single git clone, do the rebase, and then change
branches to create the ohters.  but i presume this is a normal git
thing git clone to get rid of stuff lying around, deal with tags, and
deal with branches?

if there is documentation perhaps say that bugfix ~= stable?


On 9/26/21, Max Nikulin <manikulin@gmail.com> wrote:
> On 26/09/2021 17:31, Bastien wrote:
>> Timothy writes:
>>
>>> I’ve just had a look at the branches, and I see that we currently
>>> have
>>>
>>>      master
>>>      main
>>>      maint
>>
>> You probably listed your local branch with "git branch -a" or by
>> checking your .git/config file.
>>
>> If you clone a fresh repo like this:
>>
>> ~$ git clone https://git.savannah.gnu.org/git/emacs/org-mode.git
>>
>> and fetch all the branches (git fetch --all) you should only see
>> the three branches mentioned above.
>
>      git fetch --prune
>
> might help to keep personal local branches but to remove non-existing
> remote ones if you changed URL of origin repository. I renamed old
> "origin" and added new one with savannah URL, so each repository has its
> own branch (That is why I may be a bit wrong concerning exact behavior
> of --prune in this case).
>
>
>


-- 
The Kafka Pandemic

Please learn what misopathy is.
https://thekafkapandemic.blogspot.com/2013/10/why-some-diseases-are-wronged.html


      reply	other threads:[~2021-09-26 19:47 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-26 10:21 Org branches: master, main, and maint? Timothy
2021-09-26 10:31 ` Bastien
2021-09-26 10:47   ` Timothy
2021-09-26 11:36   ` Max Nikulin
2021-09-26 19:46     ` Samuel Wales [this message]

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='CAJcAo8uW0SYuD1Y1umyuZh=6JzQnfqcdkO0+vWQZRmm+_ZV5Jg@mail.gmail.com' \
    --to=samologist@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=manikulin@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
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

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