diff options
| author | Mark Wielaard <mark@klomp.org> | 2023-11-03 15:05:57 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2023-11-03 15:07:09 +0100 |
| commit | e9d1bf6b11b1ae42a52e4a7f015ff067a618379e (patch) | |
| tree | 4f653695e7bce752b96adb6928e14bdbf221de32 | |
| parent | fb232b56ca4dc37a70fd4e581a0fc2c56dda5e0a (diff) | |
| download | elfutils-e9d1bf6b11b1ae42a52e4a7f015ff067a618379e.tar.gz | |
The default branch is now 'main'
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>
| -rw-r--r-- | CONTRIBUTING | 2 |
1 files changed, 1 insertions, 1 deletions
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. |