diff mbox series

[COMMITTED] The default branch is now 'main'

Message ID 20231103140843.603989-1-mark@klomp.org
State Committed
Headers
Series [COMMITTED] The default branch is now 'main' |

Commit Message

Mark Wielaard Nov. 3, 2023, 2:08 p.m. UTC 
  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 mbox series

Patch

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.