Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-checkout.txt: spell out --no-option
author
Nguyễn Thái Ngọc Duy
<pclouds@gmail.com>
Fri, 29 Mar 2019 10:38:53 +0000
(17:38 +0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 2 Apr 2019 04:56:58 +0000
(13:56 +0900)
It's easier to search for and also less cryptic.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-checkout.txt
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
e902e9b
)
diff --git
a/Documentation/git-checkout.txt
b/Documentation/git-checkout.txt
index f179b43732aa2a7e211a95889847294890c90d38..99c8c0dc0f837ba744cf7e4c5af650bb160ba4bf 100644
(file)
--- a/
Documentation/git-checkout.txt
+++ b/
Documentation/git-checkout.txt
@@
-118,7
+118,8
@@
OPTIONS
--quiet::
Quiet, suppress feedback messages.
--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
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
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
--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.
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
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.
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
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