summaryrefslogtreecommitdiff
path: root/Documentation/git.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:58 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-12-19 19:33:58 (GMT)
commit8d7fefaac4318ac3155368f475e10f97714ebd47 (patch)
tree225f9c262ffa4d1bcd58a2b407df396594a711cb /Documentation/git.txt
parent66d3f19324ac9eeae8ef0d2ae2067ae7b18f8ac8 (diff)
parent64a5e98032d2462749021136a53d9e1928cd0db0 (diff)
downloadgit-8d7fefaac4318ac3155368f475e10f97714ebd47.zip
git-8d7fefaac4318ac3155368f475e10f97714ebd47.tar.gz
git-8d7fefaac4318ac3155368f475e10f97714ebd47.tar.bz2
Merge branch 'ar/unconfuse-three-dots'
Ancient part of codebase still shows dots after an abbreviated object name just to show that it is not a full object name, but these ellipses are confusing to people who newly discovered Git who are used to seeing abbreviated object names and find them confusing with the range syntax. * ar/unconfuse-three-dots: t2020: test variations that matter t4013: test new output from diff --abbrev --raw diff: diff_aligned_abbrev: remove ellipsis after abbreviated SHA-1 value t4013: prepare for upcoming "diff --raw --abbrev" output format change checkout: describe_detached_head: remove ellipsis after committish print_sha1_ellipsis: introduce helper Documentation: user-manual: limit usage of ellipsis Documentation: revisions: fix typo: "three dot" ---> "three-dot" (in line with "two-dot").
Diffstat (limited to 'Documentation/git.txt')
-rw-r--r--Documentation/git.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt
index e75db10..3f4161a 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -736,6 +736,15 @@ corresponding standard handle, and if `GIT_REDIRECT_STDERR` is
`2>&1`, standard error will be redirected to the same handle as
standard output.
+`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)::
+ If set to `yes`, print an ellipsis following an
+ (abbreviated) SHA-1 value. This affects indications of
+ detached HEADs (linkgit:git-checkout[1]) and the raw
+ diff output (linkgit:git-diff[1]). Printing an
+ ellipsis in the cases mentioned is no longer considered
+ adequate and support for it is likely to be removed in the
+ foreseeable future (along with the variable).
+
Discussion[[Discussion]]
------------------------