diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2022-04-13 14:51:53 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2022-04-13 14:51:53 +0800 |
| commit | 61de00a32115b6090891f20797fdfd1501709ab9 (patch) | |
| tree | e6a0290cef9e52589a8b78e55dbae3daf559e202 /contrib | |
| parent | Merge branch 'fr_2.36_rnd1' of github.com:jnavila/git (diff) | |
| parent | Git 2.36-rc2 (diff) | |
| download | git-61de00a32115b6090891f20797fdfd1501709ab9.tar.gz git-61de00a32115b6090891f20797fdfd1501709ab9.zip | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git: (25 commits)
Git 2.36-rc2
i18n: fix some badly formatted i18n strings
Git 2.36-rc1
t9902: split test to run on appropriate systems
ls-tree doc: document interaction with submodules
Documentation: add --batch-command to cat-file synopsis
git-ls-tree.txt: fix the name of "%(objectsize:padded)"
submodule-helper: fix usage string
doc: replace "--" with {litdd} in credential-cache/fsmonitor
contrib/scalar: fix 'all' target in Makefile
Documentation/Makefile: fix "make info" regression in dad9cd7d518
configure.ac: fix HAVE_SYNC_FILE_RANGE definition
git-compat-util: really support openssl as a source of entropy
ls-tree: `-l` should not imply recursive listing
Git 2.35.2
Git 2.34.2
Git 2.33.2
Git 2.32.1
Git 2.31.2
Git 2.30.3
...
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/scalar/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/scalar/Makefile b/contrib/scalar/Makefile index 5e86d78e19..37f283f35d 100644 --- a/contrib/scalar/Makefile +++ b/contrib/scalar/Makefile @@ -11,7 +11,7 @@ include ../../config.mak.uname TARGETS = scalar$(X) scalar.o GITLIBS = ../../common-main.o ../../libgit.a ../../xdiff/lib.a -all: scalar$(X) ../../bin-wrappers/scalar +all:: scalar$(X) ../../bin-wrappers/scalar $(GITLIBS): $(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) $(subst ../../,,$@) |