emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* master-->main?
@ 2021-10-04 12:04 Uwe Brauer
  2021-10-04 17:20 ` master-->main? Bhavin Gandhi
  0 siblings, 1 reply; 2+ messages in thread
From: Uwe Brauer @ 2021-10-04 12:04 UTC (permalink / raw)
  To: emacs-orgmode


Hi

I did a git pull and obtained 

from git://git.sv.gnu.org/emacs/org-mode
 * [new branch]      bugfix     -> origin/bugfix
   dd9105d..fedcb49  emacs-sync -> origin/emacs-sync
 * [new branch]      main       -> origin/main
 * [new tag]         release_9.5 -> release_9.5
Your configuration specifies to merge with the ref 'refs/heads/master'
from the remote, but no such ref was fetched.


So I set in my config 

	merge = refs/heads/master

To 

	merge = refs/heads/main

Was master «renamed» main, I mean is the default branch now main instead of master?

Regards

Uwe Brauer 



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: master-->main?
  2021-10-04 12:04 master-->main? Uwe Brauer
@ 2021-10-04 17:20 ` Bhavin Gandhi
  0 siblings, 0 replies; 2+ messages in thread
From: Bhavin Gandhi @ 2021-10-04 17:20 UTC (permalink / raw)
  To: emacs-orgmode

Hi Uwe,

On Mon, 4 Oct 2021 at 17:50, Uwe Brauer <oub@mat.ucm.es> wrote:
>
> Was master «renamed» main, I mean is the default branch now main instead of master?
>

As far as I have understood, yes. master branch was renamed to main.
Reference: https://list.orgmode.org/87ee9bbpc9.fsf@gnu.org/

-- 
Regards,
Bhavin Gandhi (bhavin192) | https://geeksocket.in


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-10-04 17:21 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-04 12:04 master-->main? Uwe Brauer
2021-10-04 17:20 ` master-->main? Bhavin Gandhi

Code repositories for project(s) associated with this 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).