diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2020-12-21 07:10:19 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2020-12-21 07:10:19 +0800 |
| commit | 3104153d5ea3bd0e68166e02ec847a895f9a76e6 (patch) | |
| tree | 8b65383c203c550fab3f6ffea51cd474168ac34b /gitweb/Makefile | |
| parent | da5bf7b515cb61535f413b2a44aa33248091f286 (diff) | |
| parent | 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707 (diff) | |
| download | git-3104153d5ea3bd0e68166e02ec847a895f9a76e6.tar.xz | |
Merge remote-tracking branch 'github/master' into git-po-master
* github/master: (42 commits)
Git 2.30-rc1
git-gui: use gray background for inactive text widgets
Another batch before 2.30-rc1
git-gui: Fix selected text colors
Makefile: conditionally include GIT-VERSION-FILE
git-gui: fix colored label backgrounds when using themed widgets
config.mak.uname: remove old NonStop compatibility settings
diff: correct interaction between --exit-code and -I<pattern>
t/perf: fix test_export() failure with BSD `sed`
style: do not "break" in switch() after "return"
compat-util: pretend that stub setitimer() always succeeds
strmap: make callers of strmap_remove() to call it in void context
doc: mention Python 3.x supports
index-format.txt: document v2 format of file system monitor extension
docs: multi-pack-index: remove note about future 'verify' work
init: provide useful advice about init.defaultBranch
get_default_branch_name(): prepare for showing some advice
branch -m: allow renaming a yet-unborn branch
init: document `init.defaultBranch` better
t7900: use --fixed-value in git-maintenance tests
...
Diffstat (limited to 'gitweb/Makefile')
| -rw-r--r-- | gitweb/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gitweb/Makefile b/gitweb/Makefile index cd194d057f..f13e23c4de 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -48,7 +48,9 @@ HIGHLIGHT_BIN = highlight ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE $(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE +ifneq ($(MAKECMDGOALS),clean) -include ../GIT-VERSION-FILE +endif ### Build rules |