Junio C Hamano 3aa7239c30 Merge branch 'tb/rerere-wait-for-merge-rr-lock' into seen ... Instead of failing to record conflicts to be resolved immediately, wait while "rerere gc" is ongoing. * tb/rerere-wait-for-merge-rr-lock: rerere: go on at a conflict when the lock stays busy rerere: wait for MERGE_RR.lock, and let the gc skip it		2026-09-17 12:54:46 -07:00
..
add.c	Merge branch 'gr/add-e-use-apply-api'	2026-09-07 09:32:06 -07:00
am.c	rerere: go on at a conflict when the lock stays busy	2026-09-14 08:03:41 -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	bisect: fix "--" detection when a term name is "--"	2026-09-02 13:09:41 -07:00
blame.c	diff: consult oid-only hunk providers via diff.<driver>.process	2026-09-03 07:43:11 -07:00
branch.c	Merge branch 'hn/branch-delete-merged'	2026-08-20 07:30:51 -07:00
bugreport.c	…
bundle.c	bundle: generate packfiles via the object database	2026-08-21 09:01:55 -07:00
cat-file.c	Merge branch 'ps/cat-file-remote-object-info-type'	2026-08-23 18:01:42 -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	…
check-ref-format.c	refs: remove remaining uses of `the_repository`	2026-07-16 07:40:22 -07: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 'jc/checkout-refactor' into seen	2026-09-17 12:54:41 -07:00
clean.c	…
clone.c	Merge branch 'ps/ref-storage-format' into jch	2026-09-17 12:54:15 -07:00
column.c	…
commit-graph.c	…
commit-tree.c	…
commit.c	Merge branch 'ec/commit-fixup-options' into seen	2026-09-17 12:54:35 -07:00
config.c	Merge branch 'dw/config-read-both-global' into jch	2026-09-17 12:54:18 -07:00
count-objects.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
describe.c	Merge branch 'kk/prio-queue-get-put-fusion'	2026-07-13 08:27:27 -07:00
diagnose.c	…
diff-files.c	…
diff-hunks.c	diff-hunks: add the store format, library, and command	2026-09-03 07:43:08 -07:00
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	diff: record precomputed hunks during stat output	2026-09-03 07:43:11 -07:00
diff.c	diff: consult oid-only hunk providers via diff.<driver>.process	2026-09-03 07:43:11 -07:00
difftool.c	Merge branch 'rs/tempfile-wo-the-repository'	2026-07-30 10:32:02 -07:00
fast-export.c	Merge branch 'ps/refspec-wo-the-repository'	2026-07-27 09:09:00 -07:00
fast-import.c	fast-import: use early_scan_options() for --allow-unsafe-features	2026-09-02 13:09:42 -07:00
fetch-pack.c	repository: move fetch_if_missing into struct repository	2026-08-15 08:37:54 -07:00
fetch.c	Merge branch 'pz/fetch-submodule-errors-config' into seen	2026-09-17 12:54:37 -07:00
fmt-merge-msg.c	…
for-each-ref.c	…
for-each-repo.c	…
fsck.c	Merge branch 'ps/odb-pluggable-fsck'	2026-09-15 11:07:37 -07:00
fsmonitor--daemon.c	fsmonitor: plug token-data leak on early daemon-startup failures	2026-07-05 09:12:10 -07:00
gc.c	builtin/maintenance: improve heuristic for "rerere gc"	2026-09-04 07:27:14 -07:00
get-tar-commit-id.c	…
grep.c	builtin/grep: stop registering submodule ODB as source	2026-09-11 08:46:10 -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 jch	2026-09-17 12:54:13 -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 'bc/restrict-hex-to-lowercase' into seen	2026-09-17 12:54:38 -07:00
init-db.c	Merge branch 'ps/ref-storage-format' into jch	2026-09-17 12:54:15 -07:00
interpret-trailers.c	Merge branch 'kh/doc-interpret-trailers-1'	2026-03-27 11:00:02 -07:00
last-modified.c	Merge branch 'tc/last-modified-bloom' into seen	2026-09-17 12:54:42 -07:00
log.c	diff: consult oid-only hunk providers via diff.<driver>.process	2026-09-03 07:43:11 -07:00
ls-files.c	Merge branch 'js/objects-larger-than-4gb-on-windows-more'	2026-06-21 16:41:38 -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	mailsplit: move NULL check before first use of file handle	2026-07-10 08:13:54 -07:00
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-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	rerere: go on at a conflict when the lock stays busy	2026-09-14 08:03:41 -07: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	mktree: do not use OBJECT_INFO_QUICK when checking objects	2026-08-30 13:37:42 -07:00
multi-pack-index.c	Merge branch 'tb/midx-incremental-custom-base' into seen	2026-09-17 12:54:36 -07:00
mv.c	Merge branch 'lo/mv-missing-dest-dir-check'	2026-08-11 10:07:00 -07:00
name-rev.c	format-rev: learn --abbrev, --color, and --date	2026-08-18 03:30:43 -07:00
notes.c	worktree: pass repository to public functions	2026-07-16 07:40:22 -07:00
pack-objects.c	Merge branch 'as/utimensat-utimes' into jch	2026-09-17 12:54:17 -07:00
pack-redundant.c	…
pack-refs.c	…
patch-id.c	hash: use git_hash_init() consistently	2026-07-07 21:56:00 -07:00
prune-packed.c	…
prune.c	repository: move fetch_if_missing into struct repository	2026-08-15 08:37:54 -07:00
pull.c	refspec: let callers pass in hash algorithm when parsing items	2026-07-16 13:58:25 -07:00
push.c	Merge branch 'tc/push-force-if-includes-fixes' into seen	2026-09-17 12:54:45 -07:00
range-diff.c	range-diff: add --matched-only to skip one-sided commits	2026-09-15 08:46:28 -07:00
read-tree.c	setup: stop using `the_repository` in `setup_work_tree()`	2026-05-19 19:36:24 +09:00
rebase.c	rebase, cherry-pick, revert: run auto maintenance when done	2026-09-17 12:37:00 -07:00
receive-pack.c	receive-pack: coccinelle fix	2026-09-14 15:36:48 -07:00
reflog.c	worktree: pass repository to public functions	2026-07-16 07:40:22 -07:00
refs.c	builtin/refs: rename "--ref-format=" to "--ref-storage-format="	2026-09-09 11:04:30 -07:00
remote-ext.c	…
remote-fd.c	…
remote.c	odb: rename `odb_has_object()` flags	2026-03-31 20:43:14 -07:00
repack.c	Merge branch 'tb/midx-incremental-custom-base' into seen	2026-09-17 12:54:36 -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-08-31 10:29:06 -07:00
repo.c	repo: add path.cdup	2026-09-11 09:16:47 -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	Merge branch 'sa/rev-list-missing-only'	2026-09-14 14:02:53 -07:00
rev-parse.c	Merge branch 'cc/early-scan-options' into seen	2026-09-17 12:54:42 -07:00
revert.c	rebase, cherry-pick, revert: run auto maintenance when done	2026-09-17 12:37:00 -07:00
rm.c	setup: stop using `the_repository` in `setup_work_tree()`	2026-05-19 19:36:24 +09:00
send-pack.c	Merge branch 'tc/push-force-if-includes-fixes' into seen	2026-09-17 12:54:45 -07:00
shortlog.c	parse-options: exit 0 on -h	2026-07-07 17:48:57 -07: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-ref.c	odb: rename `odb_has_object()` flags	2026-03-31 20:43:14 -07:00
sparse-checkout.c	use repo_hold_lock_file_for_update{,_mode,_timeout}() with custom repos	2026-07-14 12:54:25 -07:00
stash.c	Merge branch 'tb/rerere-wait-for-merge-rr-lock' into seen	2026-09-17 12:54:46 -07:00
stripspace.c	setup: stop using `the_repository` in `setup_git_directory_gently()`	2026-05-19 19:36:24 +09:00
submodule--helper.c	Merge branch 'vv/branch-recurse-no-start-ref' into jch	2026-09-17 12:54:18 -07: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	Merge branch 'jt/receive-pack-pluggable-writes'	2026-08-31 08:25:00 -07:00
update-index.c	Merge branch 'dk/use-nsec-runtime' into jch	2026-09-17 12:54:16 -07: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	builtin/upload-pack: set GIT_NO_LAZY_FETCH to 0 on trusted repo	2026-09-08 10:02:57 -07:00
url-parse.c	builtin: create url-parse command	2026-05-06 09:48:28 +09:00
var.c	var: support broken-down idents, signing key, multiple args, and -z	2026-09-15 08:48:02 -07:00
verify-commit.c	…
verify-pack.c	…
verify-tag.c	…
worktree.c	Merge branch 'rs/worktree-add-basename-fixes'	2026-09-10 05:36:16 -07:00
write-tree.c	…