aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-08-24 14:54:31 -0700
committerJunio C Hamano <gitster@pobox.com>2020-08-24 14:54:31 -0700
commitd1ff7411f3538812796048e8f5bba717bb79fa2f (patch)
tree2a275d3df34ef2898ad888f4835babe8654c3cd7 /Documentation/git.txt
parentd8488b9e86f241ba313d04091449869fb15154d6 (diff)
parentff233d8dda12657a90d378f2b403bc6c85838c59 (diff)
downloadgit-d1ff7411f3538812796048e8f5bba717bb79fa2f.tar.gz
Merge branch 'ma/doc-sha-256-is-experimental'
The recent addition of SHA-256 support is marked as experimental in the documentation. * ma/doc-sha-256-is-experimental: Documentation: mark `--object-format=sha256` as experimental
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 81349a84e7..2fc92586b5 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -504,7 +504,8 @@ double-quotes and respecting backslash escapes. E.g., the value
If this variable is set, the default hash algorithm for new
repositories will be set to this value. This value is currently
ignored when cloning; the setting of the remote repository
- is used instead. The default is "sha1".
+ is used instead. The default is "sha1". THIS VARIABLE IS
+ EXPERIMENTAL! See `--object-format` in linkgit:git-init[1].
Git Commits
~~~~~~~~~~~