[v6,01/27] git-checkout.txt: spell out --no-option

Message ID	20190329103919.15642-2-pclouds@gmail.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <git-owner@kernel.org> From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?= <pclouds@gmail.com> 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> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: git-owner@vger.kernel.org Precedence: bulk
Series	Add new command 'switch' \| expand [v6,00/27] Add new command 'switch' [v6,01/27] git-checkout.txt: spell out --no-option [v6,02/27] git-checkout.txt: fix one syntax line [v6,03/27] doc: document --overwrite-ignore [v6,04/27] git-checkout.txt: fix monospace typeset [v6,05/27] t: rename t2014-switch.sh to t2014-checkout-switch.sh [v6,06/27] checkout: advice how to get out of detached HEAD mode [v6,07/27] checkout: inform the user when removing branch state [v6,08/27] checkout: keep most #include sorted [v6,09/27] checkout: factor out some code in parse_branchname_arg() [v6,10/27] checkout: make "opts" in cmd_checkout() a pointer [v6,11/27] checkout: move 'confict_style' and 'dwim_..' to checkout_opts [v6,12/27] checkout: split options[] array in three pieces [v6,13/27] checkout: split part of it to new command 'switch' [v6,14/27] switch: better names for -b and -B [v6,15/27] switch: add --discard-changes [v6,16/27] switch: remove -l [v6,17/27] switch: stop accepting pathspec [v6,18/27] switch: reject "do nothing" case [v6,19/27] switch: only allow explicit detached HEAD [v6,20/27] switch: add short option for --detach [v6,21/27] switch: implicit dwim, use --no-guess to disable it [v6,22/27] switch: no worktree status unless real branch switch happens [v6,23/27] switch: reject if some operation is in progress [v6,24/27] switch: make --orphan switch to an empty tree [v6,25/27] t: add tests for switch [v6,26/27] completion: support switch [v6,27/27] doc: promote "git switch"

Message ID

20190329103919.15642-2-pclouds@gmail.com (mailing list archive)

State

New, archived

Headers

From: =?utf-8?b?Tmd1eeG7hW4gVGjDoWkgTmfhu41jIER1eQ==?=  <pclouds@gmail.com>
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>
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
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

Add new command 'switch' | expand

Commit Message

Duy Nguyen March 29, 2019, 10:38 a.m. UTC

It's easier to search for and also less cryptic.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
---
 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

[v6,01/27] git-checkout.txt: spell out --no-option

Commit Message

Patch