kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

describe-doc: clarify default length of abbreviation 

Clarify the default length used for the abbreviated form used for
commits in git describe.

The behavior was modified in Git 2.11.0, but the documentation was not
updated to clarify the new behavior.

Signed-off-by: Anders Höckersten <anders@hockersten.se>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Anders Höckersten 2021-05-17 05:53:50 +00:00 committed by Junio C Hamano
parent 0628636d0c
commit bfe35a6165
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Documentation/git-describe.txt
View File

@ -63,9 +63,10 @@ OPTIONS
Automatically implies --tags. Automatically implies --tags.


--abbrev=<n>:: --abbrev=<n>::
Instead of using the default 7 hexadecimal digits as the Instead of using the default number of hexadecimal digits (which
abbreviated object name, use <n> digits, or as many digits will vary according to the number of objects in the repository with
as needed to form a unique object name. An <n> of 0 a default of 7) of the abbreviated object name, use <n> digits, or
as many digits as needed to form a unique object name. An <n> of 0
will suppress long format, only showing the closest tag. will suppress long format, only showing the closest tag.


--candidates=<n>:: --candidates=<n>::
@ -139,8 +140,11 @@ at the end.


The number of additional commits is the number The number of additional commits is the number
of commits which would be displayed by "git log v1.0.4..parent". of commits which would be displayed by "git log v1.0.4..parent".
The hash suffix is "-g" + unambiguous abbreviation for the tip commit The hash suffix is "-g" + an unambigous abbreviation for the tip commit
of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The
length of the abbreviation scales as the repository grows, using the
approximate number of objects in the repository and a bit of math
around the birthday paradox, and defaults to a minimum of 7.
The "g" prefix stands for "git" and is used to allow describing the version of The "g" prefix stands for "git" and is used to allow describing the version of
a software depending on the SCM the software is managed with. This is useful a software depending on the SCM the software is managed with. This is useful
in an environment where people may use different SCMs. in an environment where people may use different SCMs.