* [COMMITTED] The default branch is now 'main'
@ 2023-11-03 14:08 Mark Wielaard
0 siblings, 0 replies; only message in thread
From: Mark Wielaard @ 2023-11-03 14:08 UTC (permalink / raw)
To: elfutils-devel; +Cc: Mark Wielaard
Updated the HEAD symbolic reference.
Updated gitsigure checkref.
Updated hooks/post-receive irkerhook
Updated buildbot elfutils_[snapshots_]scheduler and elfutils_gitpoller
If you still have a checkout that refers to master and you do a git
pull you might get:
Your configuration specifies to merge with the ref
'refs/heads/master' from the remote, but no such ref was
fetched.
Make sure to rename your branch to main and set the new upstream:
$ git branch -m master main
$ git branch --unset-upstream
$ git branch -u origin/main
Signed-off-by: Mark Wielaard <mark@klomp.org>
---
CONTRIBUTING | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CONTRIBUTING b/CONTRIBUTING
index 4b6fac20..5614728e 100644
--- a/CONTRIBUTING
+++ b/CONTRIBUTING
@@ -127,7 +127,7 @@ mailinglist that the patch has been pushed.
committers may also create git branches starting with <nickname>/...
patches on these branches are works in progress, so might not be perfect
yet, but should follow the above guidelines as much as possible and should
-be aimed at integration into master. For merging a branch into master
+be aimed at integration into main. For merging a branch into main
the same process as above should be followed by posting the patches
to the list first.
--
2.41.0
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-11-03 14:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-03 14:08 [COMMITTED] The default branch is now 'main' Mark Wielaard
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).