Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'tb/bugreport-no-localtime' | Junio C Hamano | 2020-12-09 | 1 | -1/+2 |
|\ | |||||
| * | builtin/bugreport.c: use thread-safe localtime_r() | Taylor Blau | 2020-12-01 | 1 | -1/+2 |
* | | Merge branch 'rs/maintenance-run-outside-repo' | Junio C Hamano | 2020-12-09 | 3 | -8/+9 |
|\ \ | |||||
| * | | t7900: fix typo: "test_execpt_success" | Josh Steadmon | 2020-12-08 | 1 | -1/+1 |
| * | | maintenance: fix SEGFAULT when no repository | Rafael Silva | 2020-11-30 | 3 | -8/+9 |
* | | | Merge branch 'rs/fetch-pack-invalid-lockfile' | Junio C Hamano | 2020-12-09 | 1 | -2/+3 |
|\ \ \ | |||||
| * | | | fetch-pack: disregard invalid pack lockfiles | René Scharfe | 2020-11-30 | 1 | -2/+3 |
* | | | | Merge branch 'nk/perf-fsmonitor-cleanup' | Junio C Hamano | 2020-12-09 | 1 | -2/+1 |
|\ \ \ \ | |||||
| * | | | | perf/fsmonitor: use test_must_be_empty helper | Nipunn Koorapati | 2020-11-30 | 1 | -2/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge branch 'ma/grep-init-default' | Junio C Hamano | 2020-12-09 | 6 | -100/+36 |
|\ \ \ \ | |||||
| * | | | | MyFirstObjectWalk: drop `init_walken_defaults()` | Martin Ågren | 2020-11-30 | 1 | -24/+0 |
| * | | | | grep: copy struct in one fell swoop | Martin Ågren | 2020-11-30 | 1 | -23/+10 |
| * | | | | grep: use designated initializers for `grep_defaults` | Martin Ågren | 2020-11-21 | 6 | -52/+26 |
| * | | | | grep: don't set up a "default" repo for grep | Martin Ågren | 2020-11-21 | 6 | -7/+6 |
* | | | | | Merge branch 'js/trace2-session-id' | Junio C Hamano | 2020-12-09 | 12 | -3/+198 |
|\ \ \ \ \ | |||||
| * | | | | | receive-pack: log received client session ID | Josh Steadmon | 2020-11-12 | 2 | -6/+21 |
| * | | | | | send-pack: advertise session ID in capabilities | Josh Steadmon | 2020-11-12 | 1 | -0/+7 |
| * | | | | | upload-pack, serve: log received client session ID | Josh Steadmon | 2020-11-12 | 3 | -6/+24 |
| * | | | | | fetch-pack: advertise session ID in capabilities | Josh Steadmon | 2020-11-12 | 1 | -0/+9 |
| * | | | | | transport: log received server session ID | Josh Steadmon | 2020-11-12 | 2 | -0/+74 |
| * | | | | | serve: advertise session ID in v2 capabilities | Josh Steadmon | 2020-11-12 | 1 | -0/+14 |
| * | | | | | receive-pack: advertise session ID in v0 capabilities | Josh Steadmon | 2020-11-12 | 1 | -0/+8 |
| * | | | | | upload-pack: advertise session ID in v0 capabilities | Josh Steadmon | 2020-11-12 | 1 | -1/+14 |
| * | | | | | trace2: add a public function for getting the SID | Josh Steadmon | 2020-11-12 | 2 | -0/+7 |
| * | | | | | docs: new transfer.advertiseSID option | Josh Steadmon | 2020-11-12 | 1 | -0/+4 |
| * | | | | | docs: new capability to advertise session IDs | Josh Steadmon | 2020-11-12 | 2 | -2/+28 |
* | | | | | | Merge branch 'mt/do-not-use-scld-in-working-tree' | Junio C Hamano | 2020-12-09 | 5 | -6/+47 |
|\ \ \ \ \ \ | |||||
| * | | | | | | apply: don't use core.sharedRepository to create working tree files | Matheus Tavares | 2020-12-02 | 5 | -6/+47 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'ds/maintenance-part-2' | Junio C Hamano | 2020-12-09 | 1 | -2/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | t7900: speed up expensive test | Jeff King | 2020-12-02 | 1 | -2/+4 |
* | | | | | | | Merge branch 'ds/maintenance-part-1' | Junio C Hamano | 2020-12-09 | 1 | -0/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Makefile: mark git-maintenance as a builtin | Jeff King | 2020-12-02 | 1 | -0/+1 |
* | | | | | | | | Merge branch 'ds/maintenance-part-3' | Junio C Hamano | 2020-12-09 | 2 | -2/+15 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | maintenance: use 'git config --fixed-value' | Derrick Stolee | 2020-11-26 | 2 | -2/+15 |
| * | | | | | | | | Merge branch 'ds/config-literal-value' into ds/maintenance-part-3 | Junio C Hamano | 2020-11-26 | 7 | -76/+312 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch 'ds/config-literal-value' | Junio C Hamano | 2020-12-09 | 7 | -76/+312 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | config doc: value-pattern is not necessarily a regexp | Junio C Hamano | 2020-11-26 | 1 | -4/+7 |
| * | | | | | | | | config: implement --fixed-value with --get* | Derrick Stolee | 2020-11-25 | 2 | -5/+32 |
| * | | | | | | | | config: plumb --fixed-value into config API | Derrick Stolee | 2020-11-25 | 4 | -5/+73 |
| * | | | | | | | | config: add --fixed-value option, un-implemented | Derrick Stolee | 2020-11-25 | 3 | -7/+73 |
| * | | | | | | | | t1300: add test for --replace-all with value-pattern | Derrick Stolee | 2020-11-25 | 1 | -0/+14 |
| * | | | | | | | | t1300: test "set all" mode with value-pattern | Derrick Stolee | 2020-11-25 | 1 | -0/+39 |
| * | | | | | | | | config: replace 'value_regex' with 'value_pattern' | Derrick Stolee | 2020-11-25 | 4 | -44/+44 |
| * | | | | | | | | config: convert multi_replace to flags | Derrick Stolee | 2020-11-25 | 5 | -26/+45 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'tb/idx-midx-race-fix' | Junio C Hamano | 2020-12-09 | 3 | -20/+31 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | midx.c: protect against disappearing packs | Taylor Blau | 2020-11-25 | 2 | -2/+8 |
| * | | | | | | | | packfile.c: protect against disappearing indexes | Taylor Blau | 2020-11-25 | 2 | -19/+24 |
* | | | | | | | | | Merge branch 'ps/update-ref-multi-transaction' | Junio C Hamano | 2020-12-09 | 4 | -50/+126 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | update-ref: disallow "start" for ongoing transactions | Patrick Steinhardt | 2020-11-16 | 2 | -0/+13 |
| * | | | | | | | | | p1400: use `git-update-ref --stdin` to test multiple transactions | Patrick Steinhardt | 2020-11-16 | 1 | -13/+7 |