Skip to content

Commit bae74c9

Browse files
Denton-Lgitster
authored andcommitted
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>
1 parent bd00717 commit bae74c9

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Documentation/pretty-formats.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PRETTY FORMATS
44
If the commit is a merge, and if the pretty-format
55
is not 'oneline', 'email' or 'raw', an additional line is
66
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,
88
separated by spaces. Note that the listed commits may not
99
necessarily be the list of the *direct* parent commits if you
1010
have limited your view of history: for example, if you are
@@ -20,20 +20,20 @@ built-in formats:
2020

2121
* 'oneline'
2222

23-
<sha1> <title line>
23+
<hash> <title line>
2424
+
2525
This is designed to be as compact as possible.
2626

2727
* 'short'
2828

29-
commit <sha1>
29+
commit <hash>
3030
Author: <author>
3131

3232
<title line>
3333

3434
* 'medium'
3535

36-
commit <sha1>
36+
commit <hash>
3737
Author: <author>
3838
Date: <author date>
3939

@@ -43,7 +43,7 @@ This is designed to be as compact as possible.
4343

4444
* 'full'
4545

46-
commit <sha1>
46+
commit <hash>
4747
Author: <author>
4848
Commit: <committer>
4949

@@ -53,7 +53,7 @@ This is designed to be as compact as possible.
5353

5454
* 'fuller'
5555

56-
commit <sha1>
56+
commit <hash>
5757
Author: <author>
5858
AuthorDate: <author date>
5959
Commit: <committer>
@@ -65,7 +65,7 @@ This is designed to be as compact as possible.
6565

6666
* 'email'
6767

68-
From <sha1> <date>
68+
From <hash> <date>
6969
From: <author>
7070
Date: <author date>
7171
Subject: [PATCH] <title line>
@@ -75,7 +75,7 @@ This is designed to be as compact as possible.
7575
* 'raw'
7676
+
7777
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
7979
displayed in full, regardless of whether --abbrev or
8080
--no-abbrev are used, and 'parents' information show the
8181
true parent commits, without taking grafts or history

0 commit comments

Comments
 (0)