summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'tb/pack-bitmap-index-seek' into seenJunio C Hamano2023-05-171-25/+59
|\
| * pack-bitmap.c: factor out `bitmap_index_seek_commit()`Taylor Blau2023-03-201-11/+18
| * pack-bitmap.c: use `bitmap_index_seek()` where possibleTaylor Blau2023-03-201-8/+13
| * pack-bitmap.c: factor out manual `map_pos` manipulationTaylor Blau2023-03-201-0/+22
| * pack-bitmap.c: drop unnecessary 'inline'sTaylor Blau2023-03-201-2/+2
| * pack-bitmap.c: hide bitmap internals in `read_be32()`Taylor Blau2023-03-201-4/+4
| * pack-bitmap.c: hide bitmap internals in `read_u8()`Taylor Blau2023-03-201-6/+6
* | Merge branch 'ja/worktree-orphan' into seenJunio C Hamano2023-05-176-21/+735
|\ \
| * | worktree add: emit warn when there is a bad HEADJacob Abel2023-05-172-6/+46
| * | worktree add: extend DWIM to infer --orphanJacob Abel2023-05-173-1/+449
| * | worktree add: introduce "try --orphan" hintJacob Abel2023-05-175-0/+69
| * | worktree add: add --orphan flagJacob Abel2023-05-173-12/+129
| * | t2400: add tests to verify --quietJacob Abel2023-05-171-0/+36
| * | t2400: refactor "worktree add" opt exclusion testsJacob Abel2023-05-171-10/+13
| * | t2400: cleanup created worktree in testJacob Abel2023-05-171-0/+1
| * | worktree add: include -B in usage docsJacob Abel2023-05-172-2/+2
* | | Merge branch 'ab/tag-object-type-errors' into seenJunio C Hamano2023-05-1711-14/+219
|\ \ \
| * | | tag: don't emit potentially incorrect "object is a X, not a Y"Ævar Arnfjörð Bjarmason2023-05-102-4/+5
| * | | tag: don't misreport type of tagged objects in errorsÆvar Arnfjörð Bjarmason2023-05-1011-18/+75
| * | | object tests: add test for unexpected objects in tagsÆvar Arnfjörð Bjarmason2023-05-101-0/+146
| * | | Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errorsJunio C Hamano2022-11-222-5/+4
| |\ \ \
* | \ \ \ Merge branch 'cb/checkout-same-branch-twice' into seenJunio C Hamano2023-05-172-15/+51
|\ \ \ \ \
| * | | | | SQUASH??? the test marked to expect failure passes from day oneJunio C Hamano2023-03-221-1/+1
| * | | | | checkout/switch: disallow checking out same branch in multiple worktreesCarlo Marcelo Arenas Belón2023-01-202-15/+51
* | | | | | Merge branch 'tk/pull-conflict-suggest-rebase-merge-not-rebase-true' into seenJunio C Hamano2023-05-171-4/+4
|\ \ \ \ \ \
| * | | | | | pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"Tao Klerks2023-02-131-4/+4
* | | | | | | Merge branch 'cw/submodule-status-in-parallel' into seenJunio C Hamano2023-05-1710-76/+478
|\ \ \ \ \ \ \
| * | | | | | | diff-lib: parallelize run_diff_files for submodulesCalvin Wan2023-03-026-12/+274
| * | | | | | | diff-lib: refactor out diff_change logicCalvin Wan2023-03-021-17/+31
| * | | | | | | submodule: refactor is_submodule_modified()Calvin Wan2023-03-021-23/+42
| * | | | | | | submodule: move status parsing into functionCalvin Wan2023-03-021-32/+42
| * | | | | | | submodule: rename strbuf variableCalvin Wan2023-03-021-10/+13
| * | | | | | | run-command: add on_stderr_output_fn to run_processes_parallel_optsCalvin Wan2023-03-024-3/+97
* | | | | | | | Merge branch 'so/diff-merges-more' into seenJunio C Hamano2023-05-178-54/+260
|\ \ \ \ \ \ \ \
| * | | | | | | | diff-merges: improve --diff-merges documentationSergey Organov2022-12-181-54/+64
| * | | | | | | | diff-merges: issue warning on lone '-m' optionSergey Organov2022-12-181-1/+5
| * | | | | | | | diff-merges: support list of values for --diff-mergesSergey Organov2022-12-183-8/+31
| * | | | | | | | diff-merges: implement log.diffMerges-m-imply-p configSergey Organov2022-12-187-2/+31
| * | | | | | | | diff-merges: implement [no-]hide option and log.diffMergesHide configSergey Organov2022-12-188-7/+147
* | | | | | | | | Merge branch 'ed/fsmonitor-windows-named-pipe' into seenJunio C Hamano2023-05-171-16/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fsmonitor: handle differences between Windows named pipe functionsEric DeCosta2023-03-241-16/+17
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'ab/imap-send-requires-curl' into seenJunio C Hamano2023-05-175-186/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | imap-send: correctly report "host" when using "tunnel"Ævar Arnfjörð Bjarmason2023-02-021-10/+7
| * | | | | | | | | imap-send: remove old --no-curl codepathÆvar Arnfjörð Bjarmason2023-02-021-111/+16
| * | | | | | | | | imap-send: make --curl no-optionalÆvar Arnfjörð Bjarmason2023-02-023-23/+6
| * | | | | | | | | imap-send: replace auto-probe libcurl with hard dependencyÆvar Arnfjörð Bjarmason2023-02-025-42/+13
| * | | | | | | | | imap-send doc: the imap.sslVerify is used with imap.tunnelÆvar Arnfjörð Bjarmason2023-02-021-2/+1
| * | | | | | | | | imap-send: note "auth_method", not "host" on auth method failureÆvar Arnfjörð Bjarmason2023-02-021-1/+1
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'ad/test-record-count-when-harness-is-in-use' into seenJunio C Hamano2023-05-171-1/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: allow storing counts with test harnessesAdam Dinwoodie2022-12-251-1/+3
View Lorry Controller Status