summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ds/sparse-updates-oob-access-fix'Junio C Hamano2020-05-131-5/+5
|\
| * unpack-trees: avoid array out-of-bounds errorDerrick Stolee2020-05-081-5/+5
* | Merge branch 'ss/submodule-set-url-in-c'Junio C Hamano2020-05-132-21/+33
|\ \
| * | submodule: port subcommand 'set-url' from shell to CShourya Shukla2020-05-082-21/+33
* | | Merge branch 'dd/bloom-sparse-fix'Junio C Hamano2020-05-135-6/+6
|\ \ \
| * | | bloom: fix `make sparse` warningĐoàn Trần Công Danh2020-05-085-6/+6
| |/ /
* | | Merge branch 'jk/ci-only-on-selected-branches'Junio C Hamano2020-05-132-0/+68
|\ \ \
| * | | ci: allow per-branch config for GitHub ActionsJeff King2020-05-072-0/+68
| |/ /
* | | Merge branch 'ss/faq-fetch-pull'Junio C Hamano2020-05-131-0/+8
|\ \ \
| * | | gitfaq: fetching and pulling a repositoryShourya Shukla2020-05-061-0/+8
| |/ /
* | | Merge branch 'ss/faq-ignore'Junio C Hamano2020-05-131-0/+10
|\ \ \
| * | | gitfaq: files in .gitignore are trackedShourya Shukla2020-05-061-0/+10
| |/ /
* | | Merge branch 'jc/auto-gc-quiet'Junio C Hamano2020-05-137-16/+24
|\ \ \
| * | | auto-gc: pass --quiet down from am, commit, merge and rebaseJunio C Hamano2020-05-074-8/+4
| * | | auto-gc: extract a reusable helper from "git fetch"Junio C Hamano2020-05-073-8/+20
* | | | Merge branch 'cb/credential-doc-fixes'Junio C Hamano2020-05-133-25/+43
|\ \ \ \
| * | | | credential: document protocol updatesCarlo Marcelo Arenas Belón2020-05-071-13/+21
| * | | | credential: update gitcredentials documentationCarlo Marcelo Arenas Belón2020-05-071-8/+18
| * | | | credential: correct order of parameters for credential_matchCarlo Marcelo Arenas Belón2020-05-051-2/+2
| * | | | credential: update description for credential_from_url_gentlyCarlo Marcelo Arenas Belón2020-05-051-2/+2
| |/ / /
* | | | Merge branch 'tb/bitmap-walk-with-tree-zero-filter'Junio C Hamano2020-05-134-16/+90
|\ \ \ \
| * | | | pack-bitmap: pass object filter to fill-in traversalJeff King2020-05-052-5/+14
| * | | | pack-bitmap.c: support 'tree:0' filteringTaylor Blau2020-05-053-1/+50
| * | | | pack-bitmap.c: make object filtering functions genericTaylor Blau2020-05-051-11/+24
| * | | | list-objects-filter: treat NULL filter_options as "disabled"Jeff King2020-05-051-0/+3
* | | | | Merge branch 'tb/shallow-cleanup'Junio C Hamano2020-05-1316-75/+124
|\ \ \ \ \
| * | | | | shallow: use struct 'shallow_lock' for additional safetyTaylor Blau2020-04-304-16/+31
| * | | | | shallow.h: document '{commit,rollback}_shallow_file'Taylor Blau2020-04-301-0/+2
| * | | | | shallow: extract a header file for shallow-related functionsTaylor Blau2020-04-3016-61/+91
| * | | | | commit: make 'commit_graft_pos' non-staticTaylor Blau2020-04-302-1/+3
* | | | | | The eighth batchJunio C Hamano2020-05-081-0/+49
* | | | | | Merge branch 'cb/test-bash-lineno-fix'Junio C Hamano2020-05-081-8/+10
|\ \ \ \ \ \
| * | | | | | t/test_lib: avoid naked bash arrays in file_linenoCarlo Marcelo Arenas Belón2020-05-071-8/+10
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'cb/t0000-use-the-configured-shell'Junio C Hamano2020-05-081-5/+2
|\ \ \ \ \ \
| * | | | | | t/t0000-basic: make sure subtests also use TEST_SHELL_PATHCarlo Marcelo Arenas Belón2020-05-071-5/+2
* | | | | | | Merge branch 'bc/doc-credential-helper-value'Junio C Hamano2020-05-081-3/+7
|\ \ \ \ \ \ \
| * | | | | | | docs: document credential.helper allowed valuesbrian m. carlson2020-05-061-3/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'dl/doc-stash-remove-mention-of-reflog'Junio C Hamano2020-05-082-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Doc: reference the "stash list" in autostash docsDenton Liu2020-05-062-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'cb/avoid-colliding-with-netbsd-hmac'Junio C Hamano2020-05-081-3/+3
|\ \ \ \ \ \ \
| * | | | | | | builtin/receive-pack: avoid generic function name hmac()Carlo Marcelo Arenas Belón2020-05-051-3/+3
* | | | | | | | Merge branch 'es/restore-staged-from-head-by-default'Junio C Hamano2020-05-083-10/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | restore: default to HEAD when combining --staged and --worktreeEric Sunshine2020-05-053-10/+18
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'jk/arith-expansion-coding-guidelines'Junio C Hamano2020-05-081-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | CodingGuidelines: drop arithmetic expansion advice to use "$x"Jeff King2020-05-041-4/+0
| |/ / / / / / /
* | | | | | | | Merge branch 'ds/sparse-allow-empty-working-tree'Junio C Hamano2020-05-083-41/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | sparse-checkout: stop blocking empty workdirsDerrick Stolee2020-05-043-41/+13
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'jt/commit-graph-plug-memleak'Junio C Hamano2020-05-081-11/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | commit-graph: avoid memory leaksJonathan Tan2020-05-041-11/+11
* | | | | | | | | Merge branch 'jk/for-each-ref-multi-key-sort-fix'Junio C Hamano2020-05-086-11/+104
|\ \ \ \ \ \ \ \ \