From owner-dev-commits-doc-all@freebsd.org Sun Apr 11 12:04:23 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B1D275CC115 for ; Sun, 11 Apr 2021 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FJ9X74jZsz3NYb; Sun, 11 Apr 2021 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9518123BC8; Sun, 11 Apr 2021 12:04:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13BC4N2t000129; Sun, 11 Apr 2021 12:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13BC4Npb000128; Sun, 11 Apr 2021 12:04:23 GMT (envelope-from git) Date: Sun, 11 Apr 2021 12:04:23 GMT Message-Id: <202104111204.13BC4Npb000128@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Marc Fonvieille Subject: git: 05b8a96ab7 - main - Fix a typo and some word tagging. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: blackend X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05b8a96ab738dd9506ec9972d3b1a70916a98a43 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Apr 2021 12:04:23 -0000 The branch main has been updated by blackend: URL: https://cgit.FreeBSD.org/doc/commit/?id=05b8a96ab738dd9506ec9972d3b1a70916a98a43 commit 05b8a96ab738dd9506ec9972d3b1a70916a98a43 Author: Marc Fonvieille AuthorDate: 2021-04-11 12:03:33 +0000 Commit: Marc Fonvieille CommitDate: 2021-04-11 12:03:33 +0000 Fix a typo and some word tagging. --- documentation/content/en/articles/committers-guide/_index.adoc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index c6c518614a..33187e64a3 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -822,7 +822,7 @@ This document aims to define best practices when merging source commits using gi In general, we aim to use git's native support to achieve these goals rather than enforcing practices built on subversion's model. One general note: due to technical differences with Git, we will not be using git "merge commits" (created via `git merge`) in stable or releng branches. -Instead, when this document refers to "merge commits", it means a commit originally made to `main` that is replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some varation of `git cherry-pick`. +Instead, when this document refers to "merge commits", it means a commit originally made to `main` that is replicated or "landed" to a stable branch, or a commit from a stable branch that is replicated to a releng branch with some variation of `git cherry-pick`. ==== Finding Eligible Hashes to MFC @@ -1821,9 +1821,9 @@ HEAD is now at 869cbd3 Encourage contributions this produces the same effect, but I have to read a lot more and severed heads aren't an image I like to contemplate. -===== Ooops! I did a 'git pull' and it created a merge commit, what do I do? +===== Ooops! I did a `git pull` and it created a merge commit, what do I do? -**Q:** I was on autopilot and did a 'git pull' for my development tree and that created a merge commit on the mainline. +**Q:** I was on autopilot and did a `git pull` for my development tree and that created a merge commit on the mainline. How do I recover? **A:** This can happen when you invoke the pull with your development branch checked out. @@ -1845,10 +1845,10 @@ Then you simply reset your branch to the corresponding `HEAD^#`: git reset --hard HEAD^2 .... -**Q:** But I also need to fix my 'main' branch. How do I do that? +**Q:** But I also need to fix my `main` branch. How do I do that? **A:** Git keeps track of the remote repository branches in a `freebsd/` namespace. -To fix your 'main' branch, just make it point to the remote's 'main': +To fix your `main` branch, just make it point to the remote's `main`: [source,shell] ....