From patchwork Sun Mar 17 12:49:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10856303 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 60A831669 for ; Sun, 17 Mar 2019 12:50:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3DFC0294A8 for ; Sun, 17 Mar 2019 12:50:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 31AEF294AF; Sun, 17 Mar 2019 12:50:15 +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 BA5EB294A8 for ; Sun, 17 Mar 2019 12:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726927AbfCQMto (ORCPT ); Sun, 17 Mar 2019 08:49:44 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:36447 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbfCQMto (ORCPT ); Sun, 17 Mar 2019 08:49:44 -0400 Received: by mail-pg1-f194.google.com with SMTP id r124so9517104pgr.3 for ; Sun, 17 Mar 2019 05:49:44 -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=2tOVVS8Z4adb5nGyio/rZP5BiTWZiQYGAfXZvL0LLUI=; b=BdpztBiwC+v3pPBIO26EKDIpF6dhuqIuNaaDnU8ZKV5Phx2rSWjg9WezL0Y4Wqoq6P uaDvPSwWEB8u69+QsqnfFDM8Ecfnig8Fju4l7XLqTUvYRPQbLo0Ct524XowfwTpZuAX7 6ZEgNlGZOYS/YXqcQqDC5nhQoZuaM5UfTxkYHz3SOu0KcgGwanXHUgf6SJd7VXhR01rA lMYIK6NpgDTOGqAfSFZT+giYbL3YytqYcAh/q4NJktdwArbS+7JAPhv0y3CdY0nC9TVj RHFWauubHeoOgD4isHZdGO1qYGi7+QkKEyLZcIO0enuqtm09qhtQ+HxDfYbC8uxGMPdN L+xg== 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=2tOVVS8Z4adb5nGyio/rZP5BiTWZiQYGAfXZvL0LLUI=; b=Adr6DM7YDUmxq6wL/x0+KjPFQE88H9+jSoIdjlTo5q3ACIaL5k8WEyilq6V3RrBXoM FRTsNEOVliCD+W9n8C5xanbMVJCfFypsBPnxmWA2KVeRgaWszVROgQ83WaSdoKqBn+gy fdHBdLEGKMpthXzwYIqd7kIdTE7eA19+DiuLMcl0NDEzJ0jVIhllyrIdUDFMKJRRkk71 QyOJZXCegUQz8nVOVtcAhEl3mWCx8PYr/hAcEcwBmmmiLZgmN0dkfaECivOKfZKhOQD2 Y5RAg10YfAATAANTxNbw7A26QV4rBzmTgjdX8YxZhbgI3mrD9VZ/oVhI1g1XNi2F8GvX Rk6g== X-Gm-Message-State: APjAAAWckt6z3juXN8Zh/moECc7MQmy1cE9FlpNpM3+nXJxTVlGN4U9B H0K5zJQ3anLjiz1Yu9ZatuM= X-Google-Smtp-Source: APXvYqxGeKV8nI9TByhnml4UX68zQmsshbxWdz3Zx0iH6CZgOPGIr6BP2Miic3wRAIE06rRm6SlMnA== X-Received: by 2002:a65:6383:: with SMTP id h3mr12660368pgv.11.1552826983698; Sun, 17 Mar 2019 05:49:43 -0700 (PDT) Received: from ash ([171.226.148.85]) by smtp.gmail.com with ESMTPSA id g12sm28073492pfd.72.2019.03.17.05.49.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Mar 2019 05:49:42 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Sun, 17 Mar 2019 19:49:37 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, sunshine@sunshineco.com, szeder.dev@gmail.com, Elijah Newren , eckhard.s.maass@googlemail.com, =?utf-8?q?Martin_=C3=85gren?= , jacob.keller@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com Subject: [PATCH v4 01/26] git-checkout.txt: spell out --no-option Date: Sun, 17 Mar 2019 19:49:01 +0700 Message-Id: <20190317124926.17137-2-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.548.gd3c7d92dc2 In-Reply-To: <20190317124926.17137-1-pclouds@gmail.com> References: <20190308095752.8574-1-pclouds@gmail.com> <20190317124926.17137-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 Sun Mar 17 12:49:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10856305 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 A76E717EF for ; Sun, 17 Mar 2019 12:50:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 91DA7294A8 for ; Sun, 17 Mar 2019 12:50:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 864CC294AF; Sun, 17 Mar 2019 12:50:15 +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 DACD6294AB for ; Sun, 17 Mar 2019 12:50:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727069AbfCQMtv (ORCPT ); Sun, 17 Mar 2019 08:49:51 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:46857 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbfCQMtu (ORCPT ); Sun, 17 Mar 2019 08:49:50 -0400 Received: by mail-pf1-f193.google.com with SMTP id s23so9385809pfe.13 for ; Sun, 17 Mar 2019 05:49:50 -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=eca9ZsFwoVUCY2bG0QWY2+9Ai9feDkocqdnb1aXm9PY=; b=gQ0Pp0d8GgMX4veSmcmjfNY1P5yXH9dUP2+xESIwrlKouPftg+FOp5DWHzSh/tiUnw 4NA8FXuNUTR+ggqE2WUX++aPe7ZhfAZ+yRQcCI4oNYmON41ODL9Jg0s+KGcUuTt9Rv8T EFn1eiT2nowguqrLlPCuqQUNGmR7UDkc/PJbUAKL0hFkAnXDO7VvMHdJKLNmlPEdH2Vn ZyvFfSZ2QlyFKW2EVDU9TFlHqhkw50bn7IwxCA9fdtHBkKszdEcc7JnANTanw7of1kMo xFTC/GB8zE7JWADbYUrTWCYFV+ZmPTmtT+7yqu+30CRaVTM/HhmICcN5h8RmXdUORVC3 /g4Q== 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=eca9ZsFwoVUCY2bG0QWY2+9Ai9feDkocqdnb1aXm9PY=; b=PwRxHb0HbUI4ebcx1W40F3wI3Q3KsHxcAk9y5s5wySLTkf9qK0Yef5yeUHm8jt5I6D Bq7OQr6ATXoJ6Fp+9lbXD8eXPnmlHdlQ6quv6s/xJbqJu6buk5YDJmT4AmFSSik8dbIf wP+8V+gmMokknTGhzjbxXr/BPZD9cYoHvCKXCBgckOH8EjkPh2fg6hVRPwglojTvCHLI gqAcqksiAYUAQel1M0Cch84f5rC87qtacK2Ia8nnZBMtisJYCIr72cTL51ZDdbqWBaAR XTMzZaa/5aHMeis9MQo38/K/YMibTL4SPDyZ86kurjFHaXwpt5hXexBlOsK2Ou6cPQ65 p+0g== X-Gm-Message-State: APjAAAV4t8X2XuTGQBKtnSnBhaDE21CfS2JVJdlsibrB8JgbR3bIVpPg PrzYAq+LuH66zeZB9xaijlU= X-Google-Smtp-Source: APXvYqw+WO1tNCZJKuCMk9dGuZG627+h0oAFxFjxU3ZxpuODjbtHyQ6K+Z6yVxOTWVHtHn1uavzUmQ== X-Received: by 2002:a17:902:4827:: with SMTP id s36mr2419305pld.220.1552826989890; Sun, 17 Mar 2019 05:49:49 -0700 (PDT) Received: from ash ([171.226.148.85]) by smtp.gmail.com with ESMTPSA id q86sm19726990pfi.171.2019.03.17.05.49.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Mar 2019 05:49:49 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Sun, 17 Mar 2019 19:49:43 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, sunshine@sunshineco.com, szeder.dev@gmail.com, Elijah Newren , eckhard.s.maass@googlemail.com, =?utf-8?q?Martin_=C3=85gren?= , jacob.keller@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com Subject: [PATCH v4 02/26] git-checkout.txt: fix one syntax line Date: Sun, 17 Mar 2019 19:49:02 +0700 Message-Id: <20190317124926.17137-3-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.548.gd3c7d92dc2 In-Reply-To: <20190317124926.17137-1-pclouds@gmail.com> References: <20190308095752.8574-1-pclouds@gmail.com> <20190317124926.17137-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 Sun Mar 17 12:49:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10856309 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 E3B36186D for ; Sun, 17 Mar 2019 12:50:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCD82294A1 for ; Sun, 17 Mar 2019 12:50:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1166294A8; Sun, 17 Mar 2019 12:50:16 +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 06E3B294AC for ; Sun, 17 Mar 2019 12:50:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727136AbfCQMt4 (ORCPT ); Sun, 17 Mar 2019 08:49:56 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:45690 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbfCQMt4 (ORCPT ); Sun, 17 Mar 2019 08:49:56 -0400 Received: by mail-pf1-f193.google.com with SMTP id v21so9390745pfm.12 for ; Sun, 17 Mar 2019 05:49: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=hmP/b0mvRrYnqSM1WdUfs0anmj+xBr/qMdgta41Zx9w=; b=edVMXVEynLSV1EfzMhy5JTOLTXAklAlBkHbltyAojsvir0C2BeMtNJp9/QuK70hr5a 67TTqIqwljaeCCeJu8WftnSXNjTdPzWATueTs3h/i67Ph80DJOtVuyyBgGmvfdemQYIr 6CcKn3lMuc6C9Ex8z065+k4LciQ7O/vohrljCV6zKah5PUD1lTKWOCJoaWl2+9B7SD0h 6xLtOPHBlIiTybhM1yaIO+A0D/+f/WHjxiu88nwDkhh/qhbR9i1cm2kuGG4xmrsoiI2p BzkLfs6lF0UFZjVDWIzLGrlMxOHNkymMIGlJvflrP7sg846RBGXf98z9Qz0HO4H9xXhJ ft9w== 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=hmP/b0mvRrYnqSM1WdUfs0anmj+xBr/qMdgta41Zx9w=; b=A9HRUiLWOQ/2paLdusiRq4FqHSntChYh2yF+1kWE7XhZ06+7BsPNydeXGozsVqwJ7+ 3gA3NcDQdtBhh2cNSS2TdSdPfbOti3+Z9aiGSH7uNrgwTre0ypj7uyf3rQB1CbSDfmOM YZK/TS+sd9DISXdN1baaw2pprGmKkcH62Ve26NYK5a0qUR+QPup7YAA/wXyciLLjcdcx JL9x2ZKqjefVjqptUU7knHo/ZRbvpcZ60jrjDLymR02dM3Zq4ssIRV45PWUMQbPVRdKB MS0kspkN2DpdsM0ksDcJnYUG9JS8fYgjHC4q5RZflWWznP65se92LndZdwMZkN72j6c4 Bztg== X-Gm-Message-State: APjAAAUtdFJedGc5MJ58j41wK2PhE2M8YQW3OYYH//uFCbAoiP4bJqHh ckAlrj8pDS+83BJbKENzk9g= X-Google-Smtp-Source: APXvYqxpQUJ7Rv+gQRRWPkJfsLSdq+pOewvnVHrv9nSB0DSWuKNXwwk5YkOKv+kvw3kunaDyLlrTdg== X-Received: by 2002:a63:101c:: with SMTP id f28mr12525054pgl.224.1552826995796; Sun, 17 Mar 2019 05:49:55 -0700 (PDT) Received: from ash ([171.226.148.85]) by smtp.gmail.com with ESMTPSA id l7sm23641252pfj.162.2019.03.17.05.49.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Mar 2019 05:49:55 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Sun, 17 Mar 2019 19:49:50 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, sunshine@sunshineco.com, szeder.dev@gmail.com, Elijah Newren , eckhard.s.maass@googlemail.com, =?utf-8?q?Martin_=C3=85gren?= , jacob.keller@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com Subject: [PATCH v4 03/26] doc: document --overwrite-ignore Date: Sun, 17 Mar 2019 19:49:03 +0700 Message-Id: <20190317124926.17137-4-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.548.gd3c7d92dc2 In-Reply-To: <20190317124926.17137-1-pclouds@gmail.com> References: <20190308095752.8574-1-pclouds@gmail.com> <20190317124926.17137-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 | 14 ++++++++++---- Documentation/git-merge.txt | 5 +++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 28817cfa41..82e0f81869 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -271,15 +271,21 @@ 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 + 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 - will fail unless `-f` is used. If nothing (or --no-recurse-submodules) + will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`) is used, the work trees of submodules will not be updated. - Just like linkgit:git-submodule[1], this will detach the - submodules HEAD. + Just like linkgit:git-submodule[1], this will detach `HEAD` of the + submodule. --no-guess:: Do not attempt to create a branch if a remote tracking branch 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 Sun Mar 17 12:49:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Duy Nguyen X-Patchwork-Id: 10856311 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 6F5B848C0 for ; Sun, 17 Mar 2019 12:50:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 51584294A1 for ; Sun, 17 Mar 2019 12:50:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4505A294A8; Sun, 17 Mar 2019 12:50:17 +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 2704C294AE for ; Sun, 17 Mar 2019 12:50:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727161AbfCQMuE (ORCPT ); Sun, 17 Mar 2019 08:50:04 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:37752 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726204AbfCQMuE (ORCPT ); Sun, 17 Mar 2019 08:50:04 -0400 Received: by mail-pg1-f195.google.com with SMTP id q206so9505622pgq.4 for ; Sun, 17 Mar 2019 05:50:03 -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=v2kws1p5Bz+5lUfA3Xg9FlhTSxSR6bCOc1Q0QlRZmlQ=; b=WucUIdZEvz0QVzVL8/r9jQUmNzDeleNciojZ6ttdjU8VSlgkCVpig6N9rc3ui5Rnnk W8ZApw6bxG+o3fIt0ExIuDiDLuPBcnc4tvRxjRO4BU5qFHYlvdwI+8ixyi5chksl6HBG cfoYe/DVmsMmk1bXlj968+SsOAk9vUyvZMm+qvxxEtk58L+/HXO/NV5xmBDA9U/XpseZ ez1zEExzqPak3jAqk3r2TPTMijEPjB8I0gI+5YK2O1QRgrhaE3R6ypg1UCtncRJeXSZL CYLiduEgArAAi9lwskusSWwo7L2nQbz6NuvwdCM1+fKNCTirTsDwEikrGTv3aNwGyGcs 60Kg== 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=v2kws1p5Bz+5lUfA3Xg9FlhTSxSR6bCOc1Q0QlRZmlQ=; b=qxtVE4t/7HQIHGV7Vwn2ThiDClFiHTIkDAJ8HrhZVk1avGEti9nMogC7fDF+8n7ZaZ sySUpnRyDMVvFAGTPKHdV2DSXvMuhXx8X1bLw+mDY/lcJv3hj2gtmux/fUlSl59xFrmb Ik74c85X/nP47IIDfr5+Z33t7BpHOf11EJY9SKgg7jzK9humk6XM519IWbq5cNrw5//3 AsBRp+wwu1CWdfK5j51P5FXGcxJUR3AdAO+5blkXa4mo22ioDa8AO1HTiOQz4GPZiaIa TyI9AmDvKWN4ZxbjnznrLNo3vlBab74/lts1gGAN5+fZVpLpxAkzF93B6Ahg8vqZ1TPA ZrCQ== X-Gm-Message-State: APjAAAWnkOvDmS+xBMIYyIlyoE0kZ6TNEN0EnUbEjU9ODHOHXPpJaLoX ePpKcvZesGYcXZmcumzm8jA= X-Google-Smtp-Source: APXvYqwXPBwpjeGjEuvaa2osfqUVMFgacNZi28RbPmPRzuqziQISEZlWx2lOtL4/vS75K752eYq/7Q== X-Received: by 2002:a17:902:8602:: with SMTP id f2mr14634059plo.263.1552827003004; Sun, 17 Mar 2019 05:50:03 -0700 (PDT) Received: from ash ([171.226.148.85]) by smtp.gmail.com with ESMTPSA id y13sm10609398pfn.31.2019.03.17.05.49.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Mar 2019 05:50:01 -0700 (PDT) Received: by ash (sSMTP sendmail emulation); Sun, 17 Mar 2019 19:49:56 +0700 From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= To: pclouds@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, sunshine@sunshineco.com, szeder.dev@gmail.com, Elijah Newren , eckhard.s.maass@googlemail.com, =?utf-8?q?Martin_=C3=85gren?= , jacob.keller@gmail.com, phillip.wood123@gmail.com, rybak.a.v@gmail.com Subject: [PATCH v4 04/26] git-checkout.txt: fix monospace typeset Date: Sun, 17 Mar 2019 19:49:04 +0700 Message-Id: <20190317124926.17137-5-pclouds@gmail.com> X-Mailer: git-send-email 2.21.0.548.gd3c7d92dc2 In-Reply-To: <20190317124926.17137-1-pclouds@gmail.com> References: <20190308095752.8574-1-pclouds@gmail.com> <20190317124926.17137-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}"`. Add a missing possessive apostrophe after the word "submodules" while at it. Helped-by: Martin Ågren Signed-off-by: Martin Ågren Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-checkout.txt | 154 ++++++++++++++++----------------- 1 file changed, 77 insertions(+), 77 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 82e0f81869..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=