Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dir.[ch]: replace dir_init() with DIR_INIT | Ævar Arnfjörð Bjarmason | 2021-07-01 | 6 | -14/+7 |
* | Merge branch 'ab/fsck-api-cleanup' | Junio C Hamano | 2021-06-02 | 1 | -1/+2 |
|\ | |||||
| * | builtin/fsck.c: don't conflate "int" and "enum" in callback | Ævar Arnfjörð Bjarmason | 2021-06-02 | 1 | -1/+2 |
* | | Merge branch 'ab/pack-linkage-fix' | Junio C Hamano | 2021-05-27 | 1 | -7/+167 |
|\ \ | |||||
| * | | pack-objects: move static inline from a header to the sole consumer | Ævar Arnfjörð Bjarmason | 2021-05-27 | 1 | -7/+167 |
* | | | Merge branch 'mt/init-template-userpath-fix' | Junio C Hamano | 2021-05-25 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | init: fix bug regarding ~/ expansion in init.templateDir | Matheus Tavares | 2021-05-25 | 1 | -1/+2 |
* | | | | Merge branch 'dl/stash-show-untracked-fixup' | Junio C Hamano | 2021-05-22 | 1 | -4/+1 |
|\ \ \ \ | |||||
| * | | | | stash show: use stash.showIncludeUntracked even when diff options given | Denton Liu | 2021-05-22 | 1 | -4/+1 |
* | | | | | Merge branch 'wm/rev-parse-path-format-wo-arg' | Junio C Hamano | 2021-05-22 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | rev-parse: fix segfault with missing --path-format argument | Wolfgang Müller | 2021-05-17 | 1 | -0/+2 |
* | | | | | | Merge branch 'en/dir-traversal' | Junio C Hamano | 2021-05-20 | 3 | -6/+5 |
|\ \ \ \ \ \ | |||||
| * | | | | | | dir: introduce readdir_skip_dot_and_dotdot() helper | Elijah Newren | 2021-05-13 | 2 | -6/+2 |
| * | | | | | | ls-files: error out on -i unless -o or -c are specified | Elijah Newren | 2021-05-13 | 1 | -0/+3 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'dl/stash-show-untracked-fixup' | Junio C Hamano | 2021-05-16 | 1 | -2/+6 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | stash show: fix segfault with --{include,only}-untracked | Denton Liu | 2021-05-13 | 1 | -2/+6 |
* | | | | | | Merge branch 'lh/maintenance-leakfix' | Junio C Hamano | 2021-05-16 | 1 | -2/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | maintenance: fix two memory leaks | Lénaïc Huard | 2021-05-12 | 1 | -2/+8 |
* | | | | | | | Merge branch 'dd/mailinfo-quoted-cr' | Junio C Hamano | 2021-05-16 | 2 | -33/+133 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | am: learn to process quoted lines that ends with CRLF | Đoàn Trần Công Danh | 2021-05-10 | 1 | -0/+51 |
| * | | | | | | | mailinfo: allow squelching quoted CRLF warning | Đoàn Trần Công Danh | 2021-05-10 | 1 | -0/+12 |
| * | | | | | | | mailinfo: stop parsing options manually | Đoàn Trần Công Danh | 2021-05-07 | 1 | -30/+45 |
| * | | | | | | | mailinfo: load default metainfo_charset lazily | Đoàn Trần Công Danh | 2021-05-07 | 1 | -9/+31 |
* | | | | | | | | Merge branch 'mt/parallel-checkout-part-3' | Junio C Hamano | 2021-05-16 | 4 | -15/+35 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | checkout-index: add parallel checkout support | Matheus Tavares | 2021-05-05 | 1 | -9/+15 |
| * | | | | | | | | builtin/checkout.c: complete parallel checkout support | Matheus Tavares | 2021-05-05 | 1 | -4/+17 |
| * | | | | | | | | make_transient_cache_entry(): optionally alloc from mem_pool | Matheus Tavares | 2021-05-05 | 3 | -3/+3 |
* | | | | | | | | | Merge branch 'jt/push-negotiation' | Junio C Hamano | 2021-05-16 | 1 | -1/+26 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | fetch: teach independent negotiation (no packfile) | Jonathan Tan | 2021-05-05 | 1 | -1/+26 |
* | | | | | | | | | | Merge branch 'mt/clean-clean' | Junio C Hamano | 2021-05-14 | 1 | -3/+1 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | clean: remove unnecessary variable | Matheus Tavares | 2021-05-07 | 1 | -3/+1 |
* | | | | | | | | | | | Merge branch 'ow/no-dryrun-in-add-i' | Junio C Hamano | 2021-05-14 | 1 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | add: die if both --dry-run and --interactive are given | Øystein Walle | 2021-05-07 | 1 | -0/+2 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'jk/pack-objects-negative-options-fix' | Junio C Hamano | 2021-05-11 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | pack-objects: clamp negative depth to 0 | Jeff King | 2021-05-03 | 1 | -0/+2 |
| * | | | | | | | | | | | pack-objects: clamp negative window size to 0 | Jeff King | 2021-05-03 | 1 | -0/+2 |
| |/ / / / / / / / / / | |||||
* | | | | | | | | | | | Merge branch 'js/merge-already-up-to-date-message-reword' | Junio C Hamano | 2021-05-11 | 1 | -5/+9 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | merge: fix swapped "up to date" message components | Josh Soref | 2021-05-03 | 1 | -5/+9 |
| * | | | | | | | | | | | merge(s): apply consistent punctuation to "up to date" messages | Eric Sunshine | 2021-05-03 | 1 | -1/+1 |
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Merge branch 'rj/bisect-skip-honor-terms' | Junio C Hamano | 2021-05-11 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |||||
| * | | | | | | | | | | bisect--helper: use BISECT_TERMS in 'bisect skip' command | Ramsay Jones | 2021-04-30 | 1 | -0/+1 |
* | | | | | | | | | | | Merge branch 'rs/repack-without-loosening-promised-objects' | Junio C Hamano | 2021-05-10 | 2 | -3/+14 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | repack: avoid loosening promisor objects in partial clones | Rafael Silva | 2021-04-28 | 2 | -3/+14 |
* | | | | | | | | | | | | Merge branch 'bc/hash-transition-interop-part-1' | Junio C Hamano | 2021-05-10 | 17 | -67/+71 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | builtin/pack-objects: avoid using struct object_id for pack hash | brian m. carlson | 2021-04-27 | 1 | -10/+10 |
| * | | | | | | | | | | | | builtin/show-index: set the algorithm for object IDs | brian m. carlson | 2021-04-27 | 1 | -1/+3 |
| * | | | | | | | | | | | | hash: provide per-algorithm null OIDs | brian m. carlson | 2021-04-27 | 12 | -33/+35 |
| * | | | | | | | | | | | | builtin/pack-redundant: avoid casting buffers to struct object_id | brian m. carlson | 2021-04-27 | 1 | -14/+14 |
| * | | | | | | | | | | | | Use the final_oid_fn to finalize hashing of object IDs | brian m. carlson | 2021-04-27 | 3 | -4/+4 |
| * | | | | | | | | | | | | Always use oidread to read into struct object_id | brian m. carlson | 2021-04-27 | 3 | -5/+5 |
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | |