From patchwork Mon Dec 16 15:47:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Derrick Stolee via GitGitGadget X-Patchwork-Id: 11294451 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E592917F0 for ; Mon, 16 Dec 2019 15:48:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C3AC220725 for ; Mon, 16 Dec 2019 15:48:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PscI2qt1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728536AbfLPPsS (ORCPT ); Mon, 16 Dec 2019 10:48:18 -0500 Received: from mail-wm1-f46.google.com ([209.85.128.46]:39980 "EHLO mail-wm1-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728466AbfLPPsQ (ORCPT ); Mon, 16 Dec 2019 10:48:16 -0500 Received: by mail-wm1-f46.google.com with SMTP id t14so7223805wmi.5 for ; Mon, 16 Dec 2019 07:48:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=37S1UXMADHTUnnmVEO9FnwfxmeS1XCFMqK/czkp+DU0=; b=PscI2qt11AzkVKDEELtHDEUFJJiKmx403cVJh9enZRLDQ3Izf4MvXgm6ELTohrC7Xc PMqjVF601pSmyH+R7K2z+lRUaLJ2QaJSlHl8E5pK9l2sp65FzjOK+G8OJAm0IwFhtVat 05m/StkWnCblkqTHGEEkjnJEX3FBqk9JnBuz6+S8jgrTMs+cMehV4eCwU/r3wi1i4ShN naW+74zsPoJWEl8sijbVMkNwvEiG2qhmJyvP/8Y1NMDMGc108IlRjEW7jNYggedDTaIw WfeewxzOgPE2XvoBpTKvpJSLavZR6UHNJ2GOhbBpVzWrIs+FsFzP2TNh2B/KIdy6noWF e4Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=37S1UXMADHTUnnmVEO9FnwfxmeS1XCFMqK/czkp+DU0=; b=cgzAZGcPubAfAThot/etqhOamleYwiuvmnEOcXUfYKCUMyErbp93bsuYcMAk2DyXDc EEH+RO64lTukwdHaG4Qm4z6pnhhOuWZ7177Gs1248huKDIMb44T28uWMfO9UEjpKQw4u HLnRM6e0yOToomNYaWW8LF4qyXqW8pEISBr+g805VtK2w22C79PXqujZcPLsDHzQtElj dxBTvktn0ibvaYtnTZfkdnYkU7GRthPXWcSm0fUqguKIn0WLSUDstOT2+XcCjQYle6Oy fxlHp8yJbpUUSsG1e6Tr6WJ4bDp2+eO9Kw+hINgZiiIu5KEL45WxFuFywberIBA+qrDb WsYw== X-Gm-Message-State: APjAAAWQvhZS1MWJvG64xf6/LArorREceCMOzg2uJvGHmRYtn0wz1hQE TgCSRdBtQumhK9Jv5XgWuGxspCOJ X-Google-Smtp-Source: APXvYqxI4/gE+l07RqS1Od2I3Qo7GIs1UJ91uAJRsnczUeFbgUDcwEZbYeU/52yWAmKx4Yz9ZY3jJA== X-Received: by 2002:a1c:6389:: with SMTP id x131mr30311074wmb.174.1576511294215; Mon, 16 Dec 2019 07:48:14 -0800 (PST) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f17sm21342322wmc.8.2019.12.16.07.48.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Dec 2019 07:48:13 -0800 (PST) Message-Id: In-Reply-To: References: From: "Alexandr Miloslavskiy via GitGitGadget" Date: Mon, 16 Dec 2019 15:47:57 +0000 Subject: [PATCH v2 09/18] doc: checkout: synchronize description Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Phillip Wood , Junio C Hamano , Emily Shaffer , Derrick Stolee , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Alexandr Miloslavskiy , Junio C Hamano , Alexandr Miloslavskiy Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Alexandr Miloslavskiy `git add` shows an example of good writing, follow it. Signed-off-by: Alexandr Miloslavskiy --- Documentation/git-checkout.txt | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d47046e050..93124f3ad9 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -12,13 +12,13 @@ SYNOPSIS 'git checkout' [-q] [-f] [-m] --detach [] 'git checkout' [-q] [-f] [-m] [--detach] 'git checkout' [-q] [-f] [-m] [[-b|-B|--orphan] ] [] -'git checkout' [-f|--ours|--theirs|-m|--conflict=