Skip to content

Commit f35a02b

Browse files
committed
Merge branch 'po/doc-status-markup'
Update documentation mark-up. * po/doc-status-markup: doc: fix 'git status --help' character quoting
2 parents 26a22d8 + 7c45cee commit f35a02b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/git-status.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ In the short-format, the status of each path is shown as
116116

117117
where `PATH1` is the path in the `HEAD`, and the " `-> PATH2`" part is
118118
shown only when `PATH1` corresponds to a different path in the
119-
index/worktree (i.e. the file is renamed). The 'XY' is a two-letter
119+
index/worktree (i.e. the file is renamed). The `XY` is a two-letter
120120
status code.
121121

122122
The fields (including the `->`) are separated from each other by a
@@ -125,7 +125,7 @@ characters, that field will be quoted in the manner of a C string
125125
literal: surrounded by ASCII double quote (34) characters, and with
126126
interior special characters backslash-escaped.
127127

128-
For paths with merge conflicts, `X` and 'Y' show the modification
128+
For paths with merge conflicts, `X` and `Y` show the modification
129129
states of each side of the merge. For paths that do not have merge
130130
conflicts, `X` shows the status of the index, and `Y` shows the status
131131
of the work tree. For untracked paths, `XY` are `??`. Other status

0 commit comments

Comments
 (0)