diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-25 21:42:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-25 21:42:32 (GMT) |
| commit | f00ddc9f4861ab126ea48d1551dd7e2ed5f90943 (patch) | |
| tree | c47af2e86c4b56496951a5fd91892321e15c74eb /Makefile | |
| parent | a103ad6f3d58cf3d297a6b102876e2bbf09c98d7 (diff) | |
| parent | 43370b1e910f767b327046b1c4253c82e9695052 (diff) | |
| download | git-f00ddc9f4861ab126ea48d1551dd7e2ed5f90943.zip git-f00ddc9f4861ab126ea48d1551dd7e2ed5f90943.tar.gz git-f00ddc9f4861ab126ea48d1551dd7e2ed5f90943.tar.bz2 | |
Merge branch 'vd/scalar-generalize-diagnose'
The "diagnose" feature to create a zip archive for diagnostic
material has been lifted from "scalar" and made into a feature of
"git bugreport".
* vd/scalar-generalize-diagnose:
scalar: update technical doc roadmap
scalar-diagnose: use 'git diagnose --mode=all'
builtin/bugreport.c: create '--diagnose' option
builtin/diagnose.c: add '--mode' option
builtin/diagnose.c: create 'git diagnose' builtin
diagnose.c: add option to configure archive contents
scalar-diagnose: move functionality to common location
scalar-diagnose: move 'get_disk_info()' to 'compat/'
scalar-diagnose: add directory to archiver more gently
scalar-diagnose: avoid 32-bit overflow of size_t
scalar-diagnose: use "$GIT_UNZIP" in test
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -933,6 +933,7 @@ LIB_OBJS += ctype.o LIB_OBJS += date.o LIB_OBJS += decorate.o LIB_OBJS += delta-islands.o +LIB_OBJS += diagnose.o LIB_OBJS += diff-delta.o LIB_OBJS += diff-merges.o LIB_OBJS += diff-lib.o @@ -1153,6 +1154,7 @@ BUILTIN_OBJS += builtin/credential-cache.o BUILTIN_OBJS += builtin/credential-store.o BUILTIN_OBJS += builtin/credential.o BUILTIN_OBJS += builtin/describe.o +BUILTIN_OBJS += builtin/diagnose.o BUILTIN_OBJS += builtin/diff-files.o BUILTIN_OBJS += builtin/diff-index.o BUILTIN_OBJS += builtin/diff-tree.o |