From patchwork Fri Mar 29 10:38:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10876775 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 902A6186D for ; Fri, 29 Mar 2019 10:39:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7E19428705 for ; Fri, 29 Mar 2019 10:39:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 70B1428725; Fri, 29 Mar 2019 10:39:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F0F7128705 for ; Fri, 29 Mar 2019 10:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729048AbfC2Kjs (ORCPT ); Fri, 29 Mar 2019 06:39:48 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:46872 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728689AbfC2Kjs (ORCPT ); Fri, 29 Mar 2019 06:39:48 -0400 Received: by mail-pg1-f194.google.com with SMTP id q1so1010460pgv.13 for ; Fri, 29 Mar 2019 03:39:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uhSMomsE0RQrpZy11+WXvteiTD7my5g4TOCBBXbKs9U=; b=ZmimBiUIfzTReCVbH93J7HwZxu0WCfuglOWHcDaVmnqFgKZVgXfe+wmCqrtxBZaj2L rvQQc69XhG7VDV5CQ2c5vAo5AiIIBPGMPFO3NXEZAI9NoW4USHbuEatq507znlJ1OWl1 /wDzZwBREKyRGHd0fK5K1o4m1mIj60KEXB1GrH8okCXhE2wWuH/57gp7DTzyksq9Nfah v3B3IiE7yIMaW9qce4azTXZrx5gAY1Fvbw0Xkysky/ho3cbUT38V3rFku7qD/SmugmG3 FqBwGzKvzqtA5zkhxF2SbPWbPB8ILyQ2J2Uspu4JTuNggoogZUKOTQsJ2f972hBaKije 2rHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uhSMomsE0RQrpZy11+WXvteiTD7my5g4TOCBBXbKs9U=; b=F2aHDIufzK5vr/Y2akVPn7FCalvbPubZTIfx3iWqLEZb5nKNlEN73exHxo8SISP0H4 Rew3SNX11JFmSkEaIXavc4mF4IGHTh64jwdVTS25NMR5PdiU69XPfMjdSWMu4PfVCmPk OLIZ5px7Pc4B/1jIOVmwISPyiMMO6gWGdx3M2Rp2YR0rf/w3lkOgK40JAiQbslo+mSyH +nYxpmakTZKIiQ31XqfjpgAW/8Jz+j9OmNkyHCniXXuZMpN0jd+A5hemZH0ocqzqPnmj A0Gs1sSGzElRvP3cdfLgRoVUGCPKEarZYFQCzjMkX6H1t/NhbTZGeM5FRFQQSygmUPRG 8aWQ== X-Gm-Message-State: APjAAAUBumWz7QmqmidQGWhaKMfTUOqyIT6vRB9kNZWYldloXdrgtvtQ ZKSzeOGWhN4b6ceoaUp0adbE33ej X-Google-Smtp-Source: APXvYqyGpORjJr12LmSDEWB5pPLy5yYdlUrBe+W5hsVXKymo9x20F7duvS5CeB10qqj6mskeqb2Jqg== X-Received: by 2002:a63:2c3:: with SMTP id 186mr44751345pgc.161.1553855987982; Fri, 29 Mar 2019 03:39:47 -0700 (PDT) Received: from ash ([171.236.209.43]) by smtp.gmail.com with ESMTPSA id t82sm6057969pfa.153.2019.03.29.03.39.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 03:39:45 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Fri, 29 Mar 2019 17:39:40 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: eckhard.s.maass@googlemail.com, git@vger.kernel.org, gitster@pobox.com, jacob.keller@gmail.com, martin.agren@gmail.com, newren@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com, sunshine@sunshineco.com, szeder.dev@gmail.com Subject: [PATCH v6 01/27] git-checkout.txt: spell out --no-option Date: Fri, 29 Mar 2019 17:38:53 +0700 Message-Id: <20190329103919.15642-2-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.479.g47ac719cd3 In-Reply-To: <20190329103919.15642-1-pclouds@gmail.com> References: <20190321131655.15249-1-pclouds@gmail.com> <20190329103919.15642-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It's easier to search for and also less cryptic. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index f179b43732..99c8c0dc0f 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -118,7 +118,8 @@ OPTIONS --quiet:: Quiet, suppress feedback messages. ---[no-]progress:: +--progress:: +--no-progress:: Progress status is reported on the standard error stream by default when it is attached to a terminal, unless `--quiet` is specified. This flag enables progress reporting even if not @@ -262,7 +263,7 @@ edits from your current working tree. See the ``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate the `--patch` mode. + Note that this option uses the no overlay mode by default (see also -`--[no-]overlay`), and currently doesn't support overlay mode. +`--overlay`), and currently doesn't support overlay mode. --ignore-other-worktrees:: `git checkout` refuses when the wanted ref is already checked @@ -270,7 +271,8 @@ Note that this option uses the no overlay mode by default (see also out anyway. In other words, the ref can be held by more than one worktree. ---[no-]recurse-submodules:: +--recurse-submodules:: +--no-recurse-submodules:: Using --recurse-submodules will update the content of all initialized submodules according to the commit recorded in the superproject. If local modifications in a submodule would be overwritten the checkout @@ -283,7 +285,8 @@ Note that this option uses the no overlay mode by default (see also Do not attempt to create a branch if a remote tracking branch of the same name exists. ---[no-]overlay:: +--overlay:: +--no-overlay:: In the default overlay mode, `git checkout` never removes files from the index or the working tree. When specifying `--no-overlay`, files that appear in the index and From patchwork Fri Mar 29 10:38:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10876777 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3A7B1186D for ; Fri, 29 Mar 2019 10:39:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2674B28705 for ; Fri, 29 Mar 2019 10:39:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 19D1328725; Fri, 29 Mar 2019 10:39:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 13F462870B for ; Fri, 29 Mar 2019 10:39:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729051AbfC2Kj5 (ORCPT ); Fri, 29 Mar 2019 06:39:57 -0400 Received: from mail-pf1-f194.google.com ([209.85.210.194]:33585 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728689AbfC2Kj4 (ORCPT ); Fri, 29 Mar 2019 06:39:56 -0400 Received: by mail-pf1-f194.google.com with SMTP id i19so882987pfd.0 for ; Fri, 29 Mar 2019 03:39:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dYICuZHxJa2UGqrJAsgZwTCvdrxtJIwWIcdMxQvIRwQ=; b=QWVeJyep8Xy1q4J3prgmTxKXNSQO9X++ycepM9TbFde2jye0OQ0Od3G30NZyD1uQ+l UCJ3SDkbUV+oG0jQshCeWDaxK7IxlKJaXkPvd/1o0V3Mgzlj9AhzC0W5oVxbyMVY9mzr Pm4KRlhVoAcrtBcCdA6/LZ/zWFh184/MgB9+myGtXTCWxwApk/H9Zy3izAuMksgdNarT aDU0PDdvFPhJOG/lWdUs+UxEdeGYK1tcsc9R0R/T08puZcG1/fkKnwDrHlPlbKFgKisa PaXSgP99bWg7H/FJxaaIC/wu6RON1RTY4AU1nAgtG479djtPYHky68NntApzYsrVQ4BM d3Fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dYICuZHxJa2UGqrJAsgZwTCvdrxtJIwWIcdMxQvIRwQ=; b=Bq3ldGx/6gKFFUycsW5mPgRUG6/pqdtDCuldQqS5aHuxpkoYepl5CD9shX5TJc2jV1 nFKvJbWOJMMEcPp5qnRJR3zzWJGhmjVjPfVEKlM4HPd/IY2znZNxCXP5QB2ngkZnxCr+ b0eBWwxnIsBZygE2t9r/WNk2qmFXL7B1vLMrkVIuGMWS76xj5UouubsiSw35Mpya2XNO i1MMUroXdsnM0Q5vqo4LOHhZJYeuIDeLYzUeHb504HIswdfBhh9bhFQCb6+Z8faw/E/E IkbBWL12SRegEWihubXF7Idj2jRS6ap6n6PAkYURqyYtHNRUJMwvmrGKZ0S5bhb1SvW8 igQQ== X-Gm-Message-State: APjAAAVKi6sm34g41P8jGLzIzDOmUQvp5sjgKflcSOHzoim5UC/JNnbg ZeIEbY0T2zS9ETKCCVxFGMI= X-Google-Smtp-Source: APXvYqwGfTlKPYVexetwIE097p7GF2zu5PXunQMAHLiKyYFAzyRWYyTsPa8HH7gb1rOisEG0jSbCcA== X-Received: by 2002:a63:df12:: with SMTP id u18mr44368241pgg.135.1553855995984; Fri, 29 Mar 2019 03:39:55 -0700 (PDT) Received: from ash ([171.236.209.43]) by smtp.gmail.com with ESMTPSA id a17sm4958950pgd.30.2019.03.29.03.39.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 03:39:54 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Fri, 29 Mar 2019 17:39:48 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: eckhard.s.maass@googlemail.com, git@vger.kernel.org, gitster@pobox.com, jacob.keller@gmail.com, martin.agren@gmail.com, newren@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com, sunshine@sunshineco.com, szeder.dev@gmail.com Subject: [PATCH v6 02/27] git-checkout.txt: fix one syntax line Date: Fri, 29 Mar 2019 17:38:54 +0700 Message-Id: <20190329103919.15642-3-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.479.g47ac719cd3 In-Reply-To: <20190329103919.15642-1-pclouds@gmail.com> References: <20190321131655.15249-1-pclouds@gmail.com> <20190329103919.15642-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP can be omitted in this syntax, and it's actually documented a few paragraphs down: You could omit , in which case the command degenerates to "check out the current branch", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 99c8c0dc0f..28817cfa41 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -23,7 +23,7 @@ or the specified tree. If no paths are given, 'git checkout' will also update `HEAD` to set the specified branch as the current branch. -'git checkout' :: +'git checkout' []:: To prepare for working on , switch to it by updating the index and the files in the working tree, and by pointing HEAD at the branch. Local modifications to the files in the From patchwork Fri Mar 29 10:38:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10876779 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C00AE186D for ; Fri, 29 Mar 2019 10:40:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE16D28F01 for ; Fri, 29 Mar 2019 10:40:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A277F28F33; Fri, 29 Mar 2019 10:40:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9491028F01 for ; Fri, 29 Mar 2019 10:40:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729109AbfC2KkE (ORCPT ); Fri, 29 Mar 2019 06:40:04 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:43912 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729050AbfC2KkD (ORCPT ); Fri, 29 Mar 2019 06:40:03 -0400 Received: by mail-pl1-f194.google.com with SMTP id m10so843932plt.10 for ; Fri, 29 Mar 2019 03:40:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=D0Xv7f8W5DVq8n3VwtsFRZxenm5+KkRqqoTe3PM5WFY=; b=uTbZBILKp+6bZ5ETzjF2544rLRksz/+YXqlqxdWRCJQriJnpuvggu0exQkCSi96ugT k5pP6CHJXR2nWJ1Y+CxuZg9iHP7lmlZcJyfml9BxBLh2OdyY3X6G8C3FJwCFHBnirukf Nvy2wxwxl5j9kEou4Ppb2FCz3qYlOck8T63PcIKAF4YAVcAe+277b4s66XUgsUV7En1o utL9Xg/QKofyYV3MrDIMe33KWsI4ifiesXj0TMZOy/maQzuCiy/pb9I/IeIU3mG9B8KW 4MTWtV8hP79HZBCvZYB3kebpMc3SA7EknoHe/0Ja9ri62DByGgkeSbsbVt7dnJDZriOM FLFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=D0Xv7f8W5DVq8n3VwtsFRZxenm5+KkRqqoTe3PM5WFY=; b=j6RNSZBopzRo0VfFMCiR1YsJGjofgPxbUkb3qwpcF3wmUc+9drEk6NCIdlLYV2QCUO HJ3nONQH8wq5zyD4KBtWdq6GYEworHWv63YPVvtNnqe1F/+RWcMp6iEOrwOiN5ClA7VZ MRNaKeP2gYZjHqg8lACL1uhdVf/JQHT0gmqeLIdTMj5Vt4MNqMlNFB4165WZ5dFRBMUU /IMnQO8Q4gR/0oP1W0/ndAatVj3RvcDQ0ewQhwxtRBcRw4387uPgaoW3vFlscCPcX/nJ rTVKNACxlvTVGqNYYM1owxj9XL5j5J/TbjZ4H0tqQUWqJAiY/R1lexflKYjgLn7PORWn hEzA== X-Gm-Message-State: APjAAAV2Bihf5AP8chnqApqPP8QDl6CgppiYa+Nol+NHIqF6KPpjetGd QqmHphIuEZ2o/YPuYR9lPWM= X-Google-Smtp-Source: APXvYqzqfWqzQuYKzPrjT/+/3bJokVq1xR5kx0gaQe17dJMLlsyvqWq3R/TgbmHAPsMrgkvZ0HghSg== X-Received: by 2002:a17:902:801:: with SMTP id 1mr16280545plk.299.1553856002554; Fri, 29 Mar 2019 03:40:02 -0700 (PDT) Received: from ash ([171.236.209.43]) by smtp.gmail.com with ESMTPSA id g64sm5646908pfg.13.2019.03.29.03.39.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 03:40:01 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Fri, 29 Mar 2019 17:39:56 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: eckhard.s.maass@googlemail.com, git@vger.kernel.org, gitster@pobox.com, jacob.keller@gmail.com, martin.agren@gmail.com, newren@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com, sunshine@sunshineco.com, szeder.dev@gmail.com Subject: [PATCH v6 03/27] doc: document --overwrite-ignore Date: Fri, 29 Mar 2019 17:38:55 +0700 Message-Id: <20190329103919.15642-4-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.479.g47ac719cd3 In-Reply-To: <20190329103919.15642-1-pclouds@gmail.com> References: <20190321131655.15249-1-pclouds@gmail.com> <20190329103919.15642-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I added this option in git-checkout and git-merge in c1d7036b6b (checkout,merge: disallow overwriting ignored files with --no-overwrite-ignore - 2011-11-27) but did not remember to update documentation. This completes that commit. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 6 ++++++ Documentation/git-merge.txt | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 28817cfa41..5280d1f9ed 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -271,6 +271,12 @@ Note that this option uses the no overlay mode by default (see also out anyway. In other words, the ref can be held by more than one worktree. +--overwrite-ignore:: +--no-overwrite-ignore:: + Silently overwrite ignored files when switching branches. This + is the default behavior. Use `--no-overwrite-ignore` to abort + the operation when the new branch contains ignored files. + --recurse-submodules:: --no-recurse-submodules:: Using --recurse-submodules will update the content of all initialized diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 4cc86469f3..6a9163d8fe 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -87,6 +87,11 @@ will be appended to the specified message. Allow the rerere mechanism to update the index with the result of auto-conflict resolution if possible. +--overwrite-ignore:: +--no-overwrite-ignore:: + Silently overwrite ignored files from the merge result. This + is the default behavior. Use `--no-overwrite-ignore` to abort. + --abort:: Abort the current conflict resolution process, and try to reconstruct the pre-merge state. From patchwork Fri Mar 29 10:38:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10876781 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4A9BD139A for ; Fri, 29 Mar 2019 10:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3450B28630 for ; Fri, 29 Mar 2019 10:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2875528F01; Fri, 29 Mar 2019 10:40:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B549628D1E for ; Fri, 29 Mar 2019 10:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729050AbfC2KkK (ORCPT ); Fri, 29 Mar 2019 06:40:10 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35293 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728711AbfC2KkK (ORCPT ); Fri, 29 Mar 2019 06:40:10 -0400 Received: by mail-pg1-f196.google.com with SMTP id g8so1037676pgf.2 for ; Fri, 29 Mar 2019 03:40:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Nff+2rqpHfUyD0VbdqEipBy3BpKHvj+TGygQ3NvZp0w=; b=Uo61qGSrSThgJmL/QycjDcTvOjZZqY3qxyGYfDCqsY1ILdO5Z/hatkfnp7itmRP78y kf27ampQt5m5Qiik/jSZE6nK71+OMRf7GXL6c44nLlJY4+K/DXmjeIQvHvkxxNkp8QeH b1PwN3905IWMsvzMpiILsDcEVasAxj35tf+kc2erOhCtQf+C964Q0x4zpjP9MBpqqe8S YgSfCR7sW1fmNR6pzVUbpS9vJE5q/xjxYEwgIMG1ALXs9O05hSxUaFpvrJIfYfLzv2eH +tnwn8lvVYyXDLPckr4aonY41CtsIPCkF8D67JF4FpW2DlKQALfGr7fNOsUmjIsmLZfh SAIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nff+2rqpHfUyD0VbdqEipBy3BpKHvj+TGygQ3NvZp0w=; b=tEZ7SjDYNJ2oEVO7AjYP9ARc2m+ZMgxVhnhKSGTVmnAtJdBhqXQVaODeNW6Gco7lHJ HFxAGtm1KB96N2jATapXoN90mmucsY382Rucx3uob4uBWrcG30/UArsUdNn7QSef/JnU vkefv4YFDBPc7gNHxnmJwZGRlcoMvNecx6iyzxlEIxrnJfR+FdJgvdQBI7Q5skQI3hb+ 4+CXshpKdn8PzjXG1va/BEIGohUC5DaFmM6rh2NqrcGWn3UtqMbyIaXkj3SnhggF26q4 xFmE8QW6WcMjC9VKjxOuEMsq1Q7wM1BgjWRf45CUl4S2sTK7YR62sYW1vgGWdqhHZNFT /ehw== X-Gm-Message-State: APjAAAW4sI4m5zyxEaO+QdFCrmlNfhDWa/BPg/PW8xod+BBs4ffP9qAB aZqQzLeZTW610SQKuEqhcas= X-Google-Smtp-Source: APXvYqyjCqhBLydvBzFLvwbmSIMH2BE7ocGj2SO6zCiSNQyk882sO69hfEce4sMRtHOkKCUiweJt+g== X-Received: by 2002:a63:1d26:: with SMTP id d38mr15783058pgd.357.1553856009158; Fri, 29 Mar 2019 03:40:09 -0700 (PDT) Received: from ash ([171.236.209.43]) by smtp.gmail.com with ESMTPSA id k26sm2794663pfo.111.2019.03.29.03.40.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 03:40:08 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Fri, 29 Mar 2019 17:40:02 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: eckhard.s.maass@googlemail.com, git@vger.kernel.org, gitster@pobox.com, jacob.keller@gmail.com, martin.agren@gmail.com, newren@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com, sunshine@sunshineco.com, szeder.dev@gmail.com Subject: [PATCH v6 04/27] git-checkout.txt: fix monospace typeset Date: Fri, 29 Mar 2019 17:38:56 +0700 Message-Id: <20190329103919.15642-5-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.479.g47ac719cd3 In-Reply-To: <20190329103919.15642-1-pclouds@gmail.com> References: <20190321131655.15249-1-pclouds@gmail.com> <20190329103919.15642-1-pclouds@gmail.com> MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add backticks where we have none, replace single quotes with backticks and replace double-quotes. Drop double-quotes from nested constructions such as `"@{-1}"`. Helped-by: Martin Ågren Signed-off-by: Martin Ågren Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 162 ++++++++++++++++----------------- 1 file changed, 81 insertions(+), 81 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 5280d1f9ed..bf90966c95 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -24,14 +24,14 @@ also update `HEAD` to set the specified branch as the current branch. 'git checkout' []:: - To prepare for working on , switch to it by updating + To prepare for working on ``, switch to it by updating the index and the files in the working tree, and by pointing - HEAD at the branch. Local modifications to the files in the + `HEAD` at the branch. Local modifications to the files in the working tree are kept, so that they can be committed to the - . + ``. + -If is not found but there does exist a tracking branch in -exactly one remote (call it ) with a matching name, treat as +If `` is not found but there does exist a tracking branch in +exactly one remote (call it ``) with a matching name, treat as equivalent to + ------------ @@ -47,7 +47,7 @@ branches from there if `` is ambiguous but exists on the 'origin' remote. See also `checkout.defaultRemote` in linkgit:git-config[1]. + -You could omit , in which case the command degenerates to +You could omit ``, in which case the command degenerates to "check out the current branch", which is a glorified no-op with rather expensive side-effects to show only the tracking information, if exists, for the current branch. @@ -61,7 +61,7 @@ if exists, for the current branch. `--track` without `-b` implies branch creation; see the description of `--track` below. + -If `-B` is given, is created if it doesn't exist; otherwise, it +If `-B` is given, `` is created if it doesn't exist; otherwise, it is reset. This is the transactional equivalent of + ------------ @@ -75,25 +75,25 @@ successful. 'git checkout' --detach []:: 'git checkout' [--detach] :: - Prepare to work on top of , by detaching HEAD at it + Prepare to work on top of ``, by detaching `HEAD` at it (see "DETACHED HEAD" section), and updating the index and the files in the working tree. Local modifications to the files in the working tree are kept, so that the resulting working tree will be the state recorded in the commit plus the local modifications. + -When the argument is a branch name, the `--detach` option can -be used to detach HEAD at the tip of the branch (`git checkout -` would check out that branch without detaching HEAD). +When the `` argument is a branch name, the `--detach` option can +be used to detach `HEAD` at the tip of the branch (`git checkout +` would check out that branch without detaching `HEAD`). + -Omitting detaches HEAD at the tip of the current branch. +Omitting `` detaches `HEAD` at the tip of the current branch. 'git checkout' [] [--] ...:: Overwrite paths in the working tree by replacing with the - contents in the index or in the (most often a - commit). When a is given, the paths that - match the are updated both in the index and in + contents in the index or in the `` (most often a + commit). When a `` is given, the paths that + match the `` are updated both in the index and in the working tree. + The index may contain unmerged entries because of a previous failed merge. @@ -128,7 +128,7 @@ OPTIONS -f:: --force:: When switching branches, proceed even if the index or the - working tree differs from HEAD. This is used to throw away + working tree differs from `HEAD`. This is used to throw away local changes. + When checking out paths from the index, do not fail upon unmerged @@ -155,12 +155,12 @@ on your side branch as `theirs` (i.e. "one contributor's work on top of it"). -b :: - Create a new branch named and start it at - ; see linkgit:git-branch[1] for details. + Create a new branch named `` and start it at + ``; see linkgit:git-branch[1] for details. -B :: - Creates the branch and start it at ; - if it already exists, then reset it to . This is + Creates the branch `` and start it at ``; + if it already exists, then reset it to ``. This is equivalent to running "git branch" with "-f"; see linkgit:git-branch[1] for details. @@ -173,15 +173,15 @@ If no `-b` option is given, the name of the new branch will be derived from the remote-tracking branch, by looking at the local part of the refspec configured for the corresponding remote, and then stripping the initial part up to the "*". -This would tell us to use "hack" as the local branch when branching -off of "origin/hack" (or "remotes/origin/hack", or even -"refs/remotes/origin/hack"). If the given name has no slash, or the above +This would tell us to use `hack` as the local branch when branching +off of `origin/hack` (or `remotes/origin/hack`, or even +`refs/remotes/origin/hack`). If the given name has no slash, or the above guessing results in an empty name, the guessing is aborted. You can explicitly give a name with `-b` in such a case. --no-track:: Do not set up "upstream" configuration, even if the - branch.autoSetupMerge configuration variable is true. + `branch.autoSetupMerge` configuration variable is true. -l:: Create the new branch's reflog; see linkgit:git-branch[1] for @@ -190,21 +190,21 @@ explicitly give a name with `-b` in such a case. --detach:: Rather than checking out a branch to work on it, check out a commit for inspection and discardable experiments. - This is the default behavior of "git checkout " when - is not a branch name. See the "DETACHED HEAD" section + This is the default behavior of `git checkout ` when + `` is not a branch name. See the "DETACHED HEAD" section below for details. --orphan :: - Create a new 'orphan' branch, named , started from - and switch to it. The first commit made on this + Create a new 'orphan' branch, named ``, started from + `` and switch to it. The first commit made on this new branch will have no parents and it will be the root of a new history totally disconnected from all the other branches and commits. + The index and the working tree are adjusted as if you had previously run -"git checkout ". This allows you to start a new history -that records a set of paths similar to by easily running -"git commit -a" to make the root commit. +`git checkout `. This allows you to start a new history +that records a set of paths similar to `` by easily running +`git commit -a` to make the root commit. + This can be useful when you want to publish the tree from a commit without exposing its full history. You might want to do this to publish @@ -213,17 +213,17 @@ whose full history contains proprietary or otherwise encumbered bits of code. + If you want to start a disconnected history that records a set of paths -that is totally different from the one of , then you should +that is totally different from the one of ``, then you should clear the index and the working tree right after creating the orphan -branch by running "git rm -rf ." from the top level of the working tree. +branch by running `git rm -rf .` from the top level of the working tree. Afterwards you will be ready to prepare your new files, repopulating the working tree, by copying them from elsewhere, extracting a tarball, etc. --ignore-skip-worktree-bits:: In sparse checkout mode, `git checkout -- ` would - update only entries matched by and sparse patterns - in $GIT_DIR/info/sparse-checkout. This option ignores - the sparse patterns and adds back any files in . + update only entries matched by `` and sparse patterns + in `$GIT_DIR/info/sparse-checkout`. This option ignores + the sparse patterns and adds back any files in ``. -m:: --merge:: @@ -245,18 +245,18 @@ When checking out paths from the index, this option lets you recreate the conflicted merge in the specified paths. --conflict=