summaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jp/prompt-clear-before-upstream-mark'Junio C Hamano2022-06-211-15/+17
|\
| * git-prompt: fix expansion of branch colour codesJoakim Petersen2022-06-101-6/+6
| * git-prompt: make colourization consistentJoakim Petersen2022-06-071-10/+12
* | Merge branch 'jc/cocci-cleanup'Junio C Hamano2022-06-171-12/+0
|\ \
| * | cocci: retire is_null_sha1() ruleJunio C Hamano2022-06-071-12/+0
* | | Merge branch 'jh/builtin-fsmonitor-part3'Junio C Hamano2022-06-101-0/+8
|\ \ \
| * | | fsmonitor--daemon: stub in health threadJeff Hostetler2022-05-261-0/+2
| * | | fsmonitor-settings: stub in macOS-specific incompatibility checkingJeff Hostetler2022-05-261-0/+3
| * | | fsmonitor-settings: stub in Win32-specific incompatibility checkingJeff Hostetler2022-05-261-0/+3
* | | | Merge branch 'js/scalar-diagnose'Junio C Hamano2022-06-073-2/+329
|\ \ \ \
| * | | | scalar: teach `diagnose` to gather loose objects informationMatthew John Cheetham2022-05-302-1/+63
| * | | | scalar: teach `diagnose` to gather packfile infoMatthew John Cheetham2022-05-302-1/+35
| * | | | scalar diagnose: include disk space informationJohannes Schindelin2022-05-302-0/+54
| * | | | scalar: implement `scalar diagnose`Johannes Schindelin2022-05-303-0/+170
| * | | | scalar: validate the optional enlistment argumentJohannes Schindelin2022-05-302-2/+9
| | |_|/ | |/| |
* | | | Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano2022-06-071-0/+27
|\ \ \ \
| * | | | cocci: add and apply free_commit_list() rulesÆvar Arnfjörð Bjarmason2022-04-131-0/+27
* | | | | Merge branch 'yw/cmake-updates'Junio C Hamano2022-06-071-4/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | cmake: remove (_)UNICODE def on Windows in CMakeLists.txtYuyi Wang2022-05-241-1/+1
| * | | | cmake: add pcre2 supportYuyi Wang2022-05-241-1/+15
| * | | | cmake: fix CMakeLists.txt on LinuxYuyi Wang2022-05-241-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'ep/maint-equals-null-cocci'Junio C Hamano2022-05-201-0/+30
|\ \ \ \
| * \ \ \ Merge branch 'ep/maint-equals-null-cocci' for maint-2.35Junio C Hamano2022-05-021-0/+30
| |\ \ \ \
| | * | | | contrib/coccinnelle: add equals-null.cocciElia Pinto2022-05-021-0/+30
* | | | | | Merge branch 'cg/vscode-with-gdb'Junio C Hamano2022-05-202-2/+5
|\ \ \ \ \ \
| * | | | | | contrib/vscode/: debugging with VS Code and gdbCOGONI Guillaume2022-04-082-2/+5
* | | | | | | Merge branch 'ab/misc-cleanup'Junio C Hamano2022-05-101-15/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | object-store.h: remove unused has_sha1_file*()Ævar Arnfjörð Bjarmason2022-04-011-15/+0
* | | | | | | cocci: drop bogus xstrdup_or_null() ruleJunio C Hamano2022-04-301-8/+0
* | | | | | | Merge branch 'ab/make-optim-noop'Junio C Hamano2022-04-061-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | contrib/scalar: fix 'all' target in MakefileVictoria Dye2022-04-061-1/+1
* | | | | | | Merge branch 'jh/builtin-fsmonitor-part2'Junio C Hamano2022-04-041-0/+10
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | compat/fsmonitor/fsm-listen-darwin: stub in backend for DarwinJeff Hostetler2022-03-251-0/+3
| * | | | | | compat/fsmonitor/fsm-listen-win32: stub in backend for WindowsJeff Hostetler2022-03-251-0/+7
* | | | | | | Merge branch 'tl/ls-tree-oid-only'Junio C Hamano2022-04-041-3/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | cocci: allow padding with `strbuf_addf()`Johannes Schindelin2022-03-231-3/+3
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jd/prompt-upstream-mark'Junio C Hamano2022-03-301-29/+30
|\ \ \ \ \ \
| * | | | | | git-prompt: put upstream comments togetherJustin Donnelly2022-03-231-5/+5
| * | | | | | git-prompt: make long upstream state indicator consistentJustin Donnelly2022-03-231-5/+5
| * | | | | | git-prompt: make upstream state indicator location consistentJustin Donnelly2022-03-231-12/+13
| * | | | | | git-prompt: rename `upstream` to `upstream_type`Justin Donnelly2022-03-231-13/+13
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'vd/stash-silence-reset'Junio C Hamano2022-03-301-1/+0
|\ \ \ \ \ \
| * | | | | | reset: remove 'reset.quiet' config optionVictoria Dye2022-03-231-1/+0
* | | | | | | Merge branch 'ns/core-fsyncmethod'Junio C Hamano2022-03-251-4/+12
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | core.fsyncmethod: add writeout-only modeNeeraj Singh2022-03-101-4/+12
| |/ / / / /
* | | | | | completion: tab completion of filenames for 'git restore'David Cantrell2022-03-151-0/+4
* | | | | | Merge branch 'ab/make-optim-noop'Junio C Hamano2022-03-132-15/+8
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Makefile: add "$(QUIET)" boilerplate to shared.makÆvar Arnfjörð Bjarmason2022-03-031-14/+0
| * | | | Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to itÆvar Arnfjörð Bjarmason2022-03-032-0/+6
| * | | | scalar Makefile: use "The default target of..." patternÆvar Arnfjörð Bjarmason2022-03-031-6/+7
| |/ / /