diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-26 15:22:16 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2022-07-26 15:22:16 +0300 |
| commit | d5e96de87a0f4fe222071d9abe5efc788fa0b13c (patch) | |
| tree | d34553a0a9f6e4580f9e2459793e94399d020b1d | |
| parent | 26515cc70a94c2dee3235fd447940a200ce1399d (diff) | |
| parent | e6e4d4bfa095b8a63027038a0ca41f56289e5262 (diff) | |
Merge branch 'jc-add-docs-for-git-version' into 'master'
Makefile: Add section for environment variables
See merge request gitlab-org/gitaly!4737
| -rw-r--r-- | Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -145,6 +145,11 @@ GIT_EXECUTABLES += git GIT_EXECUTABLES += git-remote-http GIT_EXECUTABLES += git-http-backend +## The version of Git to build and test Gitaly with when not used +## WITH_BUNDLED_GIT=YesPlease. Can be set to an arbitrary Git revision with +## tags, branches, and commit ids. +GIT_VERSION ?= + # The default version is used in case the caller does not set the variable or # if it is either set to the empty string or "default". ifeq (${GIT_VERSION:default=},) @@ -311,7 +316,8 @@ help: { desc = "" }' $(MAKEFILE_LIST) | sort | column -s: -t ${Q}echo "" - ${Q}echo "These are common variables which can be overridden in config.mak:" + ${Q}echo "These are common variables which can be overridden in config.mak" + ${Q}echo "or by passing them to make directly as environment variables:" ${Q}echo "" @ # Match all variables which have preceding `## ` comments and which are assigned via `?=`. |