summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/bugreport-no-localtime'Junio C Hamano2020-12-091-1/+2
|\
| * builtin/bugreport.c: use thread-safe localtime_r()Taylor Blau2020-12-011-1/+2
* | Merge branch 'rs/maintenance-run-outside-repo'Junio C Hamano2020-12-093-8/+9
|\ \
| * | t7900: fix typo: "test_execpt_success"Josh Steadmon2020-12-081-1/+1
| * | maintenance: fix SEGFAULT when no repositoryRafael Silva2020-11-303-8/+9
* | | Merge branch 'rs/fetch-pack-invalid-lockfile'Junio C Hamano2020-12-091-2/+3
|\ \ \
| * | | fetch-pack: disregard invalid pack lockfilesRené Scharfe2020-11-301-2/+3
* | | | Merge branch 'nk/perf-fsmonitor-cleanup'Junio C Hamano2020-12-091-2/+1
|\ \ \ \
| * | | | perf/fsmonitor: use test_must_be_empty helperNipunn Koorapati2020-11-301-2/+1
| | |/ / | |/| |
* | | | Merge branch 'ma/grep-init-default'Junio C Hamano2020-12-096-100/+36
|\ \ \ \
| * | | | MyFirstObjectWalk: drop `init_walken_defaults()`Martin Ågren2020-11-301-24/+0
| * | | | grep: copy struct in one fell swoopMartin Ågren2020-11-301-23/+10
| * | | | grep: use designated initializers for `grep_defaults`Martin Ågren2020-11-216-52/+26
| * | | | grep: don't set up a "default" repo for grepMartin Ågren2020-11-216-7/+6
* | | | | Merge branch 'js/trace2-session-id'Junio C Hamano2020-12-0912-3/+198
|\ \ \ \ \
| * | | | | receive-pack: log received client session IDJosh Steadmon2020-11-122-6/+21
| * | | | | send-pack: advertise session ID in capabilitiesJosh Steadmon2020-11-121-0/+7
| * | | | | upload-pack, serve: log received client session IDJosh Steadmon2020-11-123-6/+24
| * | | | | fetch-pack: advertise session ID in capabilitiesJosh Steadmon2020-11-121-0/+9
| * | | | | transport: log received server session IDJosh Steadmon2020-11-122-0/+74
| * | | | | serve: advertise session ID in v2 capabilitiesJosh Steadmon2020-11-121-0/+14
| * | | | | receive-pack: advertise session ID in v0 capabilitiesJosh Steadmon2020-11-121-0/+8
| * | | | | upload-pack: advertise session ID in v0 capabilitiesJosh Steadmon2020-11-121-1/+14
| * | | | | trace2: add a public function for getting the SIDJosh Steadmon2020-11-122-0/+7
| * | | | | docs: new transfer.advertiseSID optionJosh Steadmon2020-11-121-0/+4
| * | | | | docs: new capability to advertise session IDsJosh Steadmon2020-11-122-2/+28
* | | | | | Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano2020-12-095-6/+47
|\ \ \ \ \ \
| * | | | | | apply: don't use core.sharedRepository to create working tree filesMatheus Tavares2020-12-025-6/+47
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'ds/maintenance-part-2'Junio C Hamano2020-12-091-2/+4
|\ \ \ \ \ \
| * | | | | | t7900: speed up expensive testJeff King2020-12-021-2/+4
* | | | | | | Merge branch 'ds/maintenance-part-1'Junio C Hamano2020-12-091-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Makefile: mark git-maintenance as a builtinJeff King2020-12-021-0/+1
* | | | | | | | Merge branch 'ds/maintenance-part-3'Junio C Hamano2020-12-092-2/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | maintenance: use 'git config --fixed-value'Derrick Stolee2020-11-262-2/+15
| * | | | | | | | Merge branch 'ds/config-literal-value' into ds/maintenance-part-3Junio C Hamano2020-11-267-76/+312
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ds/config-literal-value'Junio C Hamano2020-12-097-76/+312
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | config doc: value-pattern is not necessarily a regexpJunio C Hamano2020-11-261-4/+7
| * | | | | | | | config: implement --fixed-value with --get*Derrick Stolee2020-11-252-5/+32
| * | | | | | | | config: plumb --fixed-value into config APIDerrick Stolee2020-11-254-5/+73
| * | | | | | | | config: add --fixed-value option, un-implementedDerrick Stolee2020-11-253-7/+73
| * | | | | | | | t1300: add test for --replace-all with value-patternDerrick Stolee2020-11-251-0/+14
| * | | | | | | | t1300: test "set all" mode with value-patternDerrick Stolee2020-11-251-0/+39
| * | | | | | | | config: replace 'value_regex' with 'value_pattern'Derrick Stolee2020-11-254-44/+44
| * | | | | | | | config: convert multi_replace to flagsDerrick Stolee2020-11-255-26/+45
| |/ / / / / / /
* | | | | | | | Merge branch 'tb/idx-midx-race-fix'Junio C Hamano2020-12-093-20/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | midx.c: protect against disappearing packsTaylor Blau2020-11-252-2/+8
| * | | | | | | | packfile.c: protect against disappearing indexesTaylor Blau2020-11-252-19/+24
* | | | | | | | | Merge branch 'ps/update-ref-multi-transaction'Junio C Hamano2020-12-094-50/+126
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | update-ref: disallow "start" for ongoing transactionsPatrick Steinhardt2020-11-162-0/+13
| * | | | | | | | | p1400: use `git-update-ref --stdin` to test multiple transactionsPatrick Steinhardt2020-11-161-13/+7