Junio C Hamano 756a114dec Merge branch 'hn/history-squash' into seen ...

The experimental "git history" command has been taught a new
"squash" subcommand to fold a range of commits into a single commit,
replaying any descendants on top.

* hn/history-squash:
  SQUASH??? avoid test_grep lint triggering on uses of raw grep
  SQUASH??? avoid test number clash by moving 3454-h-squash to 3455
  history: re-edit a squash with every message
  history: add squash subcommand to fold a range
  history: give commit_tree_ext a message template
  history: extract helper for a commit's parent tree

2026-06-18 13:44:54 -07:00

..

add.c

odb: split struct odb_transaction into separate header

2026-05-15 04:44:39 +09:00

am.c

hook: mark non-parallelizable hooks

2026-04-10 07:58:53 -07:00

annotate.c

…

apply.c

…

archive.c

connect: use "service" enum for "name" argument

2026-05-19 15:05:46 +09:00

backfill.c

path-walk: add pl_sparse_trees to control tree pruning

2026-05-24 18:41:06 +09:00

bisect.c

environment: stop using the_repository in is_bare_repository()

2026-06-11 05:05:54 -07:00

blame.c

environment: stop using the_repository in is_bare_repository()

2026-06-11 05:05:54 -07:00

branch.c

branch: add --dry-run for --delete-merged

2026-06-18 13:33:07 -07:00

bugreport.c

…

bundle.c

…

cat-file.c

Merge branch 'ps/cat-file-remote-object-info' into seen

2026-06-18 13:39:45 -07:00

check-attr.c

environment: stop using the_repository in is_bare_repository()

2026-06-11 05:05:54 -07:00

check-ignore.c

…

check-mailmap.c

mailmap: stop using the_repository

2026-02-20 08:13:58 -08:00

check-ref-format.c

setup: stop using the_repository in setup_git_directory_gently()

2026-05-19 19:36:24 +09:00

checkout--worker.c

…

checkout-index.c

setup: stop using the_repository in prefix_path()

2026-05-19 19:36:24 +09:00

checkout.c

Merge branch 'hn/checkout-track-fetch' into seen

2026-06-18 13:39:43 -07:00

clean.c

…

clone.c

setup: stop using the_repository in init_db()

2026-05-19 19:36:25 +09:00

column.c

…

commit-graph.c

…

commit-tree.c

commit: rename free_commit_list() to conform to coding guidelines

2026-01-15 05:32:31 -08:00

commit.c

commit: allow -c/-C for all kinds of --fixup

2026-05-26 20:46:24 +09:00

config.c

config: improve diagnostic for "set" with missing value

2026-06-03 08:39:54 +09:00

count-objects.c

…

credential-cache--daemon.c

…

credential-cache.c

…

credential-store.c

builtin/credential-store: move is_rfc3986_unreserved to url.[ch]

2026-01-12 11:56:56 -08:00

credential.c

…

describe.c

Merge branch 'kk/prio-queue-get-put-fusion' into seen

2026-06-18 13:39:45 -07:00

diagnose.c

…

diff-files.c

…

diff-index.c

setup: stop using the_repository in setup_work_tree()

2026-05-19 19:36:24 +09:00

diff-pairs.c

…

diff-tree.c

Merge branch 'ps/commit-list-functions-renamed'

2026-02-13 13:39:25 -08:00

diff.c

setup: stop using the_repository in setup_git_directory_gently()

2026-05-19 19:36:24 +09:00

difftool.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

fast-export.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

fast-import.c

Merge branch 'js/objects-larger-than-4gb-on-windows-more' into jch

2026-06-18 13:39:35 -07:00

fetch-pack.c

connect: use "service" enum for "name" argument

2026-05-19 15:05:46 +09:00

fetch.c

Merge branch 'ty/migrate-ignorecase' into seen

2026-06-18 13:39:49 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

for-each-repo.c

for-each-repo: simplify passing of parameters

2026-03-03 10:20:00 -08:00

fsck.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

fsmonitor--daemon.c

fsmonitor: convert shown khash to strset in do_handle_client

2026-04-15 08:44:34 -07:00

gc.c

Merge branch 'ps/setup-drop-global-state' into jch

2026-06-18 13:39:34 -07:00

get-tar-commit-id.c

…

grep.c

Merge branch 'ps/odb-source-packed' into jch

2026-06-18 13:39:36 -07:00

hash-object.c

setup: stop using the_repository in setup_git_directory()

2026-05-19 19:36:25 +09:00

help.c

setup: stop using the_repository in setup_git_directory_gently()

2026-05-19 19:36:24 +09:00

history.c

Merge branch 'hn/history-squash' into seen

2026-06-18 13:44:54 -07:00

hook.c

hook: allow hook.jobs=-1 to use all available CPU cores

2026-04-10 07:58:55 -07:00

index-pack.c

Merge branch 'js/objects-larger-than-4gb-on-windows-more' into jch

2026-06-18 13:39:35 -07:00

init-db.c

environment: split up concerns of is_bare_repository_cfg

2026-06-11 05:05:54 -07:00

interpret-trailers.c

Merge branch 'kh/doc-interpret-trailers-1'

2026-03-27 11:00:02 -07:00

last-modified.c

prio-queue: rename .nr to .nr_ and add accessor helpers

2026-06-09 11:11:46 -07:00

log.c

Merge branch 'mm/diff-process-hunks' into seen

2026-06-18 13:39:47 -07:00

ls-files.c

Merge branch 'js/objects-larger-than-4gb-on-windows-more' into jch

2026-06-18 13:39:35 -07:00

ls-remote.c

…

ls-tree.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

mailinfo.c

…

mailsplit.c

…

merge-base.c

commit-reach: early exit paint_down_to_common for single merge-base

2026-05-12 09:33:43 +09:00

merge-file.c

setup: stop using the_repository in setup_git_directory()

2026-05-19 19:36:25 +09:00

merge-index.c

…

merge-ours.c

merge-ours: integrate with sparse-index

2026-02-06 11:45:33 -08:00

merge-recursive.c

…

merge-tree.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

merge.c

Merge branch 'kk/merge-octopus-optim'

2026-05-27 14:15:44 +09:00

mktag.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

mktree.c

builtin/mktree: remove USE_THE_REPOSITORY_VARIABLE

2026-03-12 10:03:23 -07:00

multi-pack-index.c

Merge branch 'tb/midx-incremental-custom-base' into seen

2026-06-18 13:39:47 -07:00

mv.c

Merge branch 'ty/migrate-ignorecase' into seen

2026-06-18 13:39:49 -07:00

name-rev.c

Merge branch 'kh/name-rev-custom-format'

2026-05-19 09:57:44 +09:00

notes.c

Merge branch 'js/parseopt-subcommand-autocorrection' into seen

2026-06-18 13:39:42 -07:00

pack-objects.c

Merge branch 'tb/pack-path-walk-bitmap-delta-islands' into seen

2026-06-18 13:39:44 -07:00

pack-redundant.c

pack-redundant: fix memory leak when open_pack_index() fails

2026-02-21 21:26:53 -08:00

pack-refs.c

…

patch-id.c

patch-id: use “patch ID” throughout

2026-01-09 06:07:21 -08:00

prune-packed.c

…

prune.c

…

pull.c

fetch: add --negotiation-include option for negotiation

2026-05-20 11:33:24 +09:00

push.c

push: support pushing to a remote group

2026-05-04 10:11:17 +09:00

range-diff.c

…

read-tree.c

setup: stop using the_repository in setup_work_tree()

2026-05-19 19:36:24 +09:00

rebase.c

reset: introduce ability to skip updating HEAD

2026-06-15 10:17:26 -07:00

receive-pack.c

Merge branch 'ar/receive-pack-worktree-env'

2026-06-07 23:58:24 +09:00

reflog.c

…

refs.c

builtin/refs: add "rename" subcommand

2026-06-17 05:23:54 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Merge branch 'js/parseopt-subcommand-autocorrection' into seen

2026-06-18 13:39:42 -07:00

repack.c

Merge branch 'tb/midx-incremental-custom-base' into seen

2026-06-18 13:39:47 -07:00

replace.c

hex: add and use strbuf_add_oid_hex()

2026-05-14 15:59:25 +09:00

replay.c

replay: offer an option to linearize the commit topology

2026-06-16 07:18:34 -07:00

repo.c

Merge branch 'jk/repo-info-path-keys' into seen

2026-06-18 13:39:44 -07:00

rerere.c

…

reset.c

environment: stop using the_repository in is_bare_repository()

2026-06-11 05:05:54 -07:00

rev-list.c

rev-list: use reduce_heads() for --maximal-only

2026-04-06 12:02:30 -07:00

rev-parse.c

Merge branch 'jk/repo-info-path-keys' into seen

2026-06-18 13:39:44 -07:00

revert.c

…

rm.c

setup: stop using the_repository in setup_work_tree()

2026-05-19 19:36:24 +09:00

send-pack.c

connect: use "service" enum for "name" argument

2026-05-19 15:05:46 +09:00

shortlog.c

mailmap: stop using the_repository

2026-02-20 08:13:58 -08:00

show-branch.c

prio-queue: fold lazy_queue into prio_queue for automatic get+put fusion

2026-06-09 11:11:46 -07:00

show-index.c

show-index: use gettext wrapping in user facing error messages

2026-01-30 08:58:12 -08:00

show-ref.c

odb: rename odb_has_object() flags

2026-03-31 20:43:14 -07:00

sparse-checkout.c

Merge branch 'ob/more-repo-config-values'

2026-06-15 07:42:00 -07:00

stash.c

Merge branch 'aj/stash-patch-optimize-temporary-index'

2026-06-07 23:58:25 +09:00

stripspace.c

setup: stop using the_repository in setup_git_directory_gently()

2026-05-19 19:36:24 +09:00

submodule--helper.c

setup: stop using the_repository in setup_work_tree()

2026-05-19 19:36:24 +09:00

symbolic-ref.c

…

tag.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

unpack-file.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

unpack-objects.c

odb: use size_t for object_info.sizep and the size APIs

2026-06-15 07:45:41 -07:00

update-index.c

Merge branch 'ps/setup-wo-the-repository'

2026-05-27 14:15:46 +09:00

update-ref.c

update-ref: handle rejections while adding updates

2026-05-05 16:34:08 +09:00

update-server-info.c

…

upload-archive.c

setup: stop using the_repository in enter_repo()

2026-05-19 19:36:24 +09:00

upload-pack.c

setup: stop using the_repository in enter_repo()

2026-05-19 19:36:24 +09:00

url-parse.c

builtin: create url-parse command

2026-05-06 09:48:28 +09:00

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

tag: support arbitrary repositories in gpg_verify_tag()

2025-12-29 22:02:53 +09:00

worktree.c

hook: mark non-parallelizable hooks

2026-04-10 07:58:53 -07:00

write-tree.c

…