summaryrefslogtreecommitdiff
path: root/Documentation/diff-format.txt
diff options
context:
space:
mode:
authorChristian Meder <chris@absolutegiganten.org>2005-06-02 09:55:03 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-08 20:09:01 (GMT)
commit1ae4ee8942903ebb978c0980a34182bc4b60240e (patch)
tree7f03947f96a2deb0e4867c725b75bb1a9056072c /Documentation/diff-format.txt
parent5d6ccf5ce7f28e576a87f6c6f4f99fae90e06db6 (diff)
downloadgit-1ae4ee8942903ebb978c0980a34182bc4b60240e.zip
git-1ae4ee8942903ebb978c0980a34182bc4b60240e.tar.gz
git-1ae4ee8942903ebb978c0980a34182bc4b60240e.tar.bz2
[PATCH] Miniscule correction of diff-format.txt
Add missing "space" element to the description of the diff-format. Signed-off-by: Christian Meder <chris@absolutegiganten.org> Acked-by: Petr Baudis <pasky@ucw.cz> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/diff-format.txt')
-rw-r--r--Documentation/diff-format.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 6748761..d6ce035 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -36,12 +36,13 @@ That is, from the left to the right:
(6) sha1 for "src"; 0{40} if creation or unmerged.
(7) a space.
(8) sha1 for "dst"; 0{40} if creation, unmerged or "look at work tree".
- (9) status, followed by optional "score" number.
- (10) a tab or a NUL when '-z' option is used.
- (11) path for "src"
- (12) a tab or a NUL when '-z' option is used; only exists for C or R.
- (13) path for "dst"; only exists for C or R.
- (14) an LF or a NUL when '-z' option is used, to terminate the record.
+ (9) a space.
+ (10) status, followed by optional "score" number.
+ (11) a tab or a NUL when '-z' option is used.
+ (12) path for "src"
+ (13) a tab or a NUL when '-z' option is used; only exists for C or R.
+ (14) path for "dst"; only exists for C or R.
+ (15) an LF or a NUL when '-z' option is used, to terminate the record.
<sha1> is shown as all 0's if new is a file on the filesystem
and it is out of sync with the cache. Example: