summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-23 20:44:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-09-23 20:44:49 (GMT)
commit188da7dc094e5930d1b83c5d97f8c70c926984eb (patch)
treedb25f6a0742bba5c83a026ec849db7ac354a544a
parentbd42622e5f3ea4a5b1f5fd69174bc7914d00ea3e (diff)
parentb6d8887d3d607e0da971218f20428c0635c6362c (diff)
downloadgit-188da7dc094e5930d1b83c5d97f8c70c926984eb.zip
git-188da7dc094e5930d1b83c5d97f8c70c926984eb.tar.gz
git-188da7dc094e5930d1b83c5d97f8c70c926984eb.tar.bz2
Merge branch 'ma/doc-git-version'
Doc update. * ma/doc-git-version: documentation: add documentation for 'git version'
-rw-r--r--Documentation/git-version.txt28
-rw-r--r--Documentation/git.txt4
2 files changed, 32 insertions, 0 deletions
diff --git a/Documentation/git-version.txt b/Documentation/git-version.txt
new file mode 100644
index 0000000..80fa775
--- /dev/null
+++ b/Documentation/git-version.txt
@@ -0,0 +1,28 @@
+git-version(1)
+==============
+
+NAME
+----
+git-version - Display version information about Git
+
+SYNOPSIS
+--------
+[verse]
+'git version' [--build-options]
+
+DESCRIPTION
+-----------
+With no options given, the version of 'git' is printed on the standard output.
+
+Note that `git --version` is identical to `git version` because the
+former is internally converted into the latter.
+
+OPTIONS
+-------
+--build-options::
+ Include additional information about how git was built for diagnostic
+ purposes.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git.txt b/Documentation/git.txt
index e4b8259..abace9e 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -41,6 +41,10 @@ OPTIONS
-------
--version::
Prints the Git suite version that the 'git' program came from.
++
+This option is internaly converted to `git version ...` and accepts
+the same options as the linkgit:git-version[1] command. If `--help` is
+also given, it takes precedence over `--version`.
--help::
Prints the synopsis and a list of the most commonly used