commit 4967d3c2f206d9cb5221a57995c1f066eaba275e
from: Stefan Sperling
date: Mon Aug 12 10:53:59 2019 UTC
sync man pages
commit - 7fe2a942aca2ca92c18df73d04953f34d709697b
commit + 4967d3c2f206d9cb5221a57995c1f066eaba275e
blob - 51b47d027ff91b258ef261ce1fdc26ebd830d8e1
blob + ca55480846a4d0c4aaa70332fc8711f29e27ce4d
--- git-repository.5.html
+++ git-repository.5.html
@@ -204,7 +204,7 @@ The particular set of disallowed characters in referen
blob - c50e39e0d3e15231d5b494adecfa99989da3d67e
blob + 651c03a8a38800d72c92684f03e64902c32e6f63
--- got-worktree.5.html
+++ got-worktree.5.html
@@ -89,8 +89,8 @@ A Got work tree stores a file hierar
file index data read from disk. This happens to files which are added
to the work tree while operations such as got
checkout
, got update
,
- got cherrypick,
got
- backout,
got rebase,
and
+ got cherrypick
, got
+ backout
, got rebase
, and
got histedit
are in progress. This flag is
always cleared before the entry is written to disk.
NO_BLOB
@@ -98,16 +98,16 @@ A Got work tree stores a file hierar
blob in the repository. The blob object ID of this entry must be
considered invalid. This happens when unversioned files are added with
got add
and when files are added to the work
- tree by operations such as got cherrypick,
- got backout,
got
- rebase,
and got histedit
.
+ tree by operations such as got cherrypick
,
+ got backout
, got
+ rebase
, and got histedit
.
NO_COMMIT
The entry is not based on a commit in the repository. The commit
object ID of this entry must be considered invalid. This happens when
unversioned files are added with got add
and
when files are added to the work tree by operations such as
- got cherrypick,
got
- backout,
got rebase,
and
+ got cherrypick
, got
+ backout
, got rebase
, and
got histedit
.
NO_FILE_ON_DISK
The entry has no corresponding on-disk file in the work tree. This
@@ -174,7 +174,7 @@ A Got work tree stores a file hierar
blob - 9a2ef81b0d4dca5e68e818a3625e1dcb7b437da2
blob + 33b6fb81e57357e71bc0501bb7facb3a7af827e5
--- got.1.html
+++ got.1.html
@@ -615,7 +615,7 @@
path is specified, commit all changes in the work
tree. Otherwise, commit changes at or within the specified paths.
If changes have been explicitly staged for commit with
- got stage,
only commit staged changes and reject
+ got stage
, only commit staged changes and reject
any specified paths which have not been staged.
Show the status of each affected file, using the following
status codes:
@@ -1125,7 +1125,7 @@
email address in author data, got
attempts to
reject GOT_AUTHOR
environment variables with a
missing email address.
- VISUAL,
+ VISUAL
,
EDITOR
The editor spawned by got commit
.
@@ -1234,8 +1234,8 @@ Clone an existing Git repository for use with $ got rebase
unified-buffer-cache
Create a patch from all changes on the unified-buffer-cache
- branch. The patch can be mailed out for review and applied to OpenBSD's CVS
- tree:
+ branch. The patch can be mailed out for review and applied to
+ OpenBSD's CVS tree:
$ got diff master
unified-buffer-cache > /tmp/ubc.diff
@@ -1318,7 +1318,7 @@ Clone an existing Git repository for use with
blob - eb564a3644758629652e35c47d3d93f20f4a8189
blob + 4a2973fe6caf9a5bf47691635023355fe28c05b9
--- tog.1.html
+++ tog.1.html
@@ -333,7 +333,7 @@ The tog
utility exits 0