summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* grep: prefer "struct grep_opt" over its "void *" equivalentÆvar Arnfjörð Bjarmason2021-10-231-2/+2
* The fourteenth batchJunio C Hamano2021-10-181-0/+38
* Merge branch 'tz/doc-link-to-bundle-format-fix'Junio C Hamano2021-10-181-0/+1
|\
| * doc: add bundle-format to TECH_DOCSTodd Zullinger2021-10-131-0/+1
* | Merge branch 'js/windows-ci-path-fix'Junio C Hamano2021-10-181-3/+3
|\ \
| * | ci(windows): ensure that we do not pick up random executablesJohannes Schindelin2021-10-131-3/+3
* | | Merge branch 'bs/doc-blame-color-lines'Junio C Hamano2021-10-183-17/+44
|\ \ \
| * | | blame: document --color-* optionsBagas Sanjaya2021-10-083-17/+31
| * | | blame: describe default output formatBagas Sanjaya2021-10-011-0/+13
* | | | Merge branch 'rs/make-verify-path-really-verify-again'Junio C Hamano2021-10-182-15/+36
|\ \ \ \
| * | | | read-cache: let verify_path() reject trailing dir separators againRené Scharfe2021-10-072-4/+4
| * | | | read-cache: add verify_path_internal()René Scharfe2021-10-071-13/+28
| * | | | t3905: show failure to ignore sub-repoRené Scharfe2021-10-071-0/+6
* | | | | Merge branch 'jk/cat-file-batch-all-wo-replace'Junio C Hamano2021-10-183-16/+119
|\ \ \ \ \
| * | | | | cat-file: use packed_object_info() for --batch-all-objectsJeff King2021-10-081-14/+36
| * | | | | cat-file: split ordered/unordered batch-all-objects callbacksJeff King2021-10-081-1/+3
| * | | | | cat-file: disable refs/replace with --batch-all-objectsJeff King2021-10-083-1/+70
| * | | | | cat-file: mention --unordered along with --batch-all-objectsJeff King2021-10-081-2/+3
| * | | | | t1006: clean up broken objectsJeff King2021-10-081-0/+9
* | | | | | Merge branch 'cm/save-restore-terminal'Junio C Hamano2021-10-183-15/+71
|\ \ \ \ \ \
| * | | | | | editor: save and reset terminal after calling EDITORCarlo Marcelo Arenas Belón2021-10-061-0/+8
| * | | | | | terminal: teach git how to save/restore its terminal settingsCarlo Marcelo Arenas Belón2021-10-062-15/+63
| |/ / / / /
* | | | | | Merge branch 'ab/designated-initializers-more'Junio C Hamano2021-10-187-88/+82
|\ \ \ \ \ \
| * | | | | | builtin/remote.c: add and use SHOW_INFO_INITÆvar Arnfjörð Bjarmason2021-10-011-45/+45
| * | | | | | builtin/remote.c: add and use a REF_STATES_INITÆvar Arnfjörð Bjarmason2021-10-011-12/+11
| * | | | | | urlmatch.[ch]: add and use URLMATCH_CONFIG_INITÆvar Arnfjörð Bjarmason2021-10-014-3/+7
| * | | | | | builtin/blame.c: refactor commit_info_init() to COMMIT_INFO_INIT macroÆvar Arnfjörð Bjarmason2021-09-271-17/+13
| * | | | | | daemon.c: refactor hostinfo_init() to HOSTINFO_INIT macroÆvar Arnfjörð Bjarmason2021-09-271-12/+7
| * | | | | | Merge branch 'ab/designated-initializers' into ab/designated-initializers-moreJunio C Hamano2021-09-2729-54/+68
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'tb/repack-write-midx'Junio C Hamano2021-10-1814-56/+723
|\ \ \ \ \ \ \ \
| * | | | | | | | test-read-midx: fix leak of bitmap_index structJeff King2021-10-071-2/+6
| * | | | | | | | builtin/repack.c: pass `--refs-snapshot` when writing bitmapsTaylor Blau2021-10-012-0/+124
| * | | | | | | | builtin/repack.c: make largest pack preferredTaylor Blau2021-09-286-3/+78
| * | | | | | | | builtin/repack.c: support writing a MIDX while repackingTaylor Blau2021-09-285-24/+234
| * | | | | | | | builtin/repack.c: extract showing progress to a variableTaylor Blau2021-09-281-1/+2
| * | | | | | | | builtin/repack.c: rename variables that deal with non-kept packsTaylor Blau2021-09-281-11/+11
| * | | | | | | | builtin/repack.c: keep track of existing packs unconditionallyTaylor Blau2021-09-281-25/+31
| * | | | | | | | midx: preliminary support for `--refs-snapshot`Taylor Blau2021-09-286-13/+164
| * | | | | | | | builtin/multi-pack-index.c: support `--stdin-packs` modeTaylor Blau2021-09-283-0/+46
| * | | | | | | | midx: expose `write_midx_file_only()` publiclyTaylor Blau2021-09-282-8/+58
* | | | | | | | | Merge branch 'js/retire-preserve-merges'Junio C Hamano2021-10-1837-2263/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sequencer: restrict scope of a formerly public functionJohannes Schindelin2021-09-072-4/+2
| * | | | | | | | | rebase: remove a no-longer-used functionJohannes Schindelin2021-09-072-31/+0
| * | | | | | | | | rebase: stop mentioning the -p option in commentsJohannes Schindelin2021-09-071-1/+1
| * | | | | | | | | rebase: remove obsolete code commentJohannes Schindelin2021-09-071-1/+1
| * | | | | | | | | rebase: drop the internal `rebase--interactive` commandJohannes Schindelin2021-09-072-193/+1
| * | | | | | | | | git-svn: drop support for `--preserve-merges`Johannes Schindelin2021-09-072-2/+0
| * | | | | | | | | rebase: drop support for `--preserve-merges`Johannes Schindelin2021-09-075-1238/+11
| * | | | | | | | | pull: remove support for `--rebase=preserve`Johannes Schindelin2021-09-077-23/+8
| * | | | | | | | | tests: stop testing `git rebase --preserve-merges`Johannes Schindelin2021-09-0717-764/+3