summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* First batch after Git 2.23Junio C Hamano2019-08-223-2/+54
* Merge branch 'sg/worktree-remove-errormsg'Junio C Hamano2019-08-221-1/+1
|\
| * worktree remove: clarify error message on dirty worktreeSZEDER Gábor2019-08-131-1/+1
* | Merge branch 'en/fast-import-merge-doc'Junio C Hamano2019-08-221-1/+1
|\ \
| * | git-fast-import.txt: clarify that multiple merge commits are allowedElijah Newren2019-08-121-1/+1
* | | Merge branch 'jk/perf-no-dups'Junio C Hamano2019-08-221-0/+0
|\ \ \
| * | | t/perf: rename duplicate-numbered test scriptJeff King2019-08-121-0/+0
* | | | Merge branch 'rs/nedalloc-fixlets'Junio C Hamano2019-08-221-3/+3
|\ \ \ \
| * | | | nedmalloc: avoid compiler warning about unused valueRené Scharfe2019-08-071-2/+2
| * | | | nedmalloc: do assignments only after the declaration sectionRené Scharfe2019-08-071-1/+1
* | | | | Merge branch 'sg/show-failed-test-names'Junio C Hamano2019-08-223-12/+14
|\ \ \ \ \
| * | | | | tests: show the test name and number at the start of verbose outputSZEDER Gábor2019-08-053-6/+8
| * | | | | t0000-basic: use realistic test script names in the verbose testsSZEDER Gábor2019-08-051-6/+6
* | | | | | Merge branch 'sg/commit-graph-validate'Junio C Hamano2019-08-225-30/+51
|\ \ \ \ \ \
| * | | | | | commit-graph: error out on invalid commit oids in 'write --stdin-commits'SZEDER Gábor2019-08-054-15/+33
| * | | | | | commit-graph: turn a group of write-related macro flags into an enumSZEDER Gábor2019-08-054-14/+18
| * | | | | | t5318-commit-graph: use 'test_expect_code'SZEDER Gábor2019-08-051-2/+1
* | | | | | | Merge branch 'vn/restore-empty-ita-corner-case-fix'Junio C Hamano2019-08-223-0/+23
|\ \ \ \ \ \ \
| * | | | | | | restore: add test for deleted ita filesVarun Naik2019-08-021-0/+11
| * | | | | | | checkout.c: unstage empty deleted ita filesVarun Naik2019-08-022-0/+12
* | | | | | | | Merge branch 'sc/pack-refs-deletion-racefix'Junio C Hamano2019-08-221-7/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | pack-refs: always refresh after taking the lock fileSun Chao2019-08-021-7/+16
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'sg/do-not-skip-non-httpd-tests'Junio C Hamano2019-08-2210-122/+153
|\ \ \ \ \ \ \ \
| * | | | | | | | t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd'SZEDER Gábor2019-08-028-0/+24
| * | | | | | | | t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh'SZEDER Gábor2019-08-011-100/+104
| * | | | | | | | t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh'SZEDER Gábor2019-08-011-22/+25
* | | | | | | | | Merge branch 'jk/tree-walk-overflow'Junio C Hamano2019-08-226-68/+103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tree-walk: harden make_traverse_path() length computationsJeff King2019-08-013-10/+23
| * | | | | | | | | tree-walk: add a strbuf wrapper for make_traverse_path()Jeff King2019-08-015-17/+32
| * | | | | | | | | tree-walk: accept a raw length for traverse_path_len()Jeff King2019-08-013-6/+7
| * | | | | | | | | tree-walk: use size_t consistentlyJeff King2019-08-013-8/+8
| * | | | | | | | | tree-walk: drop oid from traverse_infoJeff King2019-07-315-39/+49
| * | | | | | | | | setup_traverse_info(): stop copying oidJeff King2019-07-313-7/+3
* | | | | | | | | | Merge branch 'sg/t5510-test-i18ngrep-fix'Junio C Hamano2019-08-221-1/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | t5510-fetch: fix negated 'test_i18ngrep' invocationSZEDER Gábor2019-07-311-1/+1
* | | | | | | | | | Merge branch 'mt/grep-submodules-working-tree'Junio C Hamano2019-08-222-4/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | grep: fix worktree case in submodulesMatheus Tavares2019-07-302-4/+27
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Git 2.23v2.23.0Junio C Hamano2019-08-161-1/+1
* | | | | | | | | | Merge tag 'l10n-2.23.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2019-08-1611-36251/+46987
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | l10n: zh_CN: for git v2.23.0 l10n round 1~2Jiang Xin2019-08-161-2910/+3413
| * | | | | | | | | l10n: de.po: Update German translationMatthias Ruester2019-08-121-2910/+3533
| * | | | | | | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2019-08-121-585/+595
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | l10n: vi(4674t): Updated translation for VietnameseTran Ngoc Quan2019-08-111-585/+595
| * | | | | | | | | | Merge branch 'update-italian-translation' of github.com:AlessandroMenti/git-poJiang Xin2019-08-121-522/+531
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | l10n: it.po: update the Italian localization for v2.23.0 round 2Alessandro Menti2019-08-111-522/+531
| | |/ / / / / / / / /
| * | | | | | | | | | Merge branch 'next' of https://github.com/ChrisADR/git-poJiang Xin2019-08-121-3030/+3598
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | l10n: es: 2.23.0 round 2Christopher Diaz Riveros2019-08-101-3030/+3598
| | |/ / / / / / / / /
| * | | | | | | | | | l10n: fr v2.23.0 round 2Jean-Noël Avila2019-08-101-2904/+3429
| |/ / / / / / / / /
| * | | | | | | | | l10n: git.pot: v2.23.0 round 2 (4 new, 6 removed)Jiang Xin2019-08-101-477/+461
| * | | | | | | | | Merge tag 'v2.23.0-rc2' of git://git.kernel.org/pub/scm/git/gitJiang Xin2019-08-1059-396/+1041
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |