aboutsummaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-12-25 11:22:00 -0800
committerJunio C Hamano <gitster@pobox.com>2019-12-25 11:22:00 -0800
commitdfee504bee4353fd7cede8b11e0090e20c69a032 (patch)
tree7e61ef11dffadd813fd193fae4e46050fbb5d554 /Documentation/diff-format.txt
parent87cbb1ca66c8a27e834d33099b6befa7f8cd989d (diff)
parentdf5be016699e5495c0360e727e32f8d73369af5b (diff)
downloadgit-dfee504bee4353fd7cede8b11e0090e20c69a032.tar.xz
Merge branch 'ja/doc-markup-cleanup'
Doc cleanup. * ja/doc-markup-cleanup: doc: indent multi-line items in list doc: remove non pure ASCII characters
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 4d846d7346..fbbd410a84 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -61,7 +61,7 @@ Possible status letters are:
- R: renaming of a file
- T: change in the type of the file
- U: file is unmerged (you must complete the merge before it can
-be committed)
+ be committed)
- X: "unknown" change type (most probably a bug, please report it)
Status letters C and R are always followed by a score (denoting the