From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id E92D83858D32 for ; Fri, 3 Nov 2023 14:08:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E92D83858D32 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E92D83858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=45.83.234.184 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699020534; cv=none; b=VGTh0bqLOxB+r/0U5KeJZl2L98Vs1cLC6o5vM5chgC4Emg4uJuFbaacX8PgSmMz0H/viz4sucX185VB2Xo95HJgB5stci4PbngUY1XzUgGR7rvt855A61J/BQ5MVLq5oXlNKT4fgM65eowoWrFtqv3AgykkHP91+ihokPXMXzFs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699020534; c=relaxed/simple; bh=JB6LlmxlSoo/GMJUhV539aMPjhCX2r4xIE/jHCxgOZM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=WvAwqKcdQxUn7CvHZ92lzUrSqv5GnHrZWCZm/DYtBJQO4aiPS+3csSjvMJbRf5d1+pPZF5l2A3cid8ohE2iY7k16Nay5KTjABvtrJrHoy/s3ZG7g/xN8T8oe/4ahANHTWRasJSVCQNVxY1qgKqITlVsWLdsk1PXBBVB0+v+RHYI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from r6.localdomain (82-217-174-174.cable.dynamic.v4.ziggo.nl [82.217.174.174]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 6DF17302FDC3; Fri, 3 Nov 2023 15:08:47 +0100 (CET) Received: by r6.localdomain (Postfix, from userid 1000) id 2BF3334032A; Fri, 3 Nov 2023 15:08:47 +0100 (CET) From: Mark Wielaard To: elfutils-devel@sourceware.org Cc: Mark Wielaard Subject: [COMMITTED] The default branch is now 'main' Date: Fri, 3 Nov 2023 15:08:30 +0100 Message-ID: <20231103140843.603989-1-mark@klomp.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3033.3 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,RCVD_IN_BARRACUDACENTRAL,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 --- 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 /... 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