pretty-formats.txt: use generic terms for hash
Since Git is planning on upgrading from SHA-1 to be more hash-agnostic, replace specific references to SHA-1 with more generic terminology. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Nov 19, 2019 at 16:51 UTC
bae74c9dfbacce38dcd8cc7c2737af11a85d9906
1 file changed
+8
-8
Documentation/pretty-formats.txt
+8
-8
@@ -4,7 +4,7 @@ PRETTY FORMATS
4
If the commit is a merge, and if the pretty-format
5
is not 'oneline', 'email' or 'raw', an additional line is
6
inserted before the 'Author:' line. This line begins with
7
-"Merge: " and the sha1s of ancestral commits are printed,
7
+"Merge: " and the hashes of ancestral commits are printed,
8
separated by spaces. Note that the listed commits may not
9
necessarily be the list of the *direct* parent commits if you
10
have limited your view of history: for example, if you are
@@ -20,20 +20,20 @@ built-in formats:
20
21
* 'oneline'
22
23
- <sha1> <title line>
23
+ <hash> <title line>
24
+
25
This is designed to be as compact as possible.
26
27
* 'short'
28
29
- commit <sha1>
29
+ commit <hash>
30
Author: <author>
31
32
<title line>
33
34
* 'medium'
35
36
- commit <sha1>
36
+ commit <hash>
37
Author: <author>
38
Date: <author date>
39
@@ -43,7 +43,7 @@ This is designed to be as compact as possible.
43
44
* 'full'
45
46
- commit <sha1>
46
+ commit <hash>
47
Author: <author>
48
Commit: <committer>
49
@@ -53,7 +53,7 @@ This is designed to be as compact as possible.
53
54
* 'fuller'
55
56
- commit <sha1>
56
+ commit <hash>
57
Author: <author>
58
AuthorDate: <author date>
59
Commit: <committer>
@@ -65,7 +65,7 @@ This is designed to be as compact as possible.
65
66
* 'email'
67
68
- From <sha1> <date>
68
+ From <hash> <date>
69
From: <author>
70
Date: <author date>
71
Subject: [PATCH] <title line>
@@ -75,7 +75,7 @@ This is designed to be as compact as possible.
75
* 'raw'
76
+
77
The 'raw' format shows the entire commit exactly as
78
-stored in the commit object. Notably, the SHA-1s are
78
+stored in the commit object. Notably, the hashes are
79
displayed in full, regardless of whether --abbrev or
80
--no-abbrev are used, and 'parents' information show the
81
true parent commits, without taking grafts or history