git/Documentation/config
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.adoc
advice.adoc Merge branch 'tc/push-force-if-includes-fixes' into seen 2026-09-17 12:54:45 -07:00
alias.adoc doc: fix list continuation in alias.adoc 2026-03-03 09:59:31 -08:00
am.adoc doc: convert git-am synopsis and options to new style 2026-05-25 20:05:44 +09:00
apply.adoc doc: convert git-apply synopsis and options to new style 2026-05-25 20:05:44 +09:00
attr.adoc
bitmap-pseudo-merge.adoc pack-bitmap: reject pseudo-merge "sampleRate" of 0 2026-05-12 10:36:18 +09:00
blame.adoc
branch.adoc Merge branch 'hn/branch-delete-merged' 2026-08-20 07:30:51 -07:00
browser.adoc
bundle.adoc
checkout.adoc doc: convert git-checkout manpage to new style 2025-05-27 07:50:58 -07:00
clean.adoc
clone.adoc
color.adoc
column.adoc
commit.adoc doc: config: mention core.commentChar on commit.cleanup 2025-05-27 15:31:06 -07:00
commitgraph.adoc commit-graph: add new config for changed-paths & recommend it in scalar 2025-10-22 10:40:11 -07:00
completion.adoc
core.adoc Merge branch 'mm/diff-process-hunks' into seen 2026-09-17 12:54:43 -07:00
credential.adoc
diff-hunks.adoc diff-hunks: add the store format, library, and command 2026-09-03 07:43:08 -07:00
diff.adoc diff: consult oid-only hunk providers via diff.<driver>.process 2026-09-03 07:43:11 -07:00
difftool.adoc doc: convert git-difftool manual page to synopsis style 2026-04-06 09:38:18 -07:00
extensions.adoc Merge branch 'kn/ref-location' 2026-03-04 10:52:59 -08:00
fastimport.adoc
feature.adoc setup: rename "init.defaultRefFormat" to "init.defaultRefStorageFormat" 2026-09-09 11:04:31 -07:00
fetch.adoc Merge branch 'pz/fetch-submodule-errors-config' into seen 2026-09-17 12:54:37 -07:00
filter.adoc
fmt-merge-msg.adoc doc: switch merge config description to new synopsis format 2025-05-27 07:51:00 -07:00
format.adoc Fix docs for format.commitListFormat 2026-04-22 16:16:24 -07:00
fsck.adoc
fsmonitor--daemon.adoc fsmonitor: implement filesystem change listener for Linux 2026-04-15 08:44:33 -07:00
gc.adoc
gitcvs.adoc completion: make sed command that generates config-list.h portable. 2025-06-02 17:21:49 -07:00
gitweb.adoc
gpg.adoc gpg-interface: expand gpg.program as a path 2025-07-14 10:07:02 -07:00
grep.adoc doc: convert git-grep synopsis and options to new style 2026-05-25 20:05:44 +09:00
gui.adoc config: document 'gui.GCWarning' 2025-12-09 07:38:56 +09:00
guitool.adoc
help.adoc Merge branch 'bc/doc-adoc-not-txt' 2025-02-14 17:53:47 -08:00
hook.adoc doc: hook: don’t self-link via config include 2026-05-22 09:36:20 +09:00
http.adoc http: add http.sslVerifyStatus to check stapled OCSP responses 2026-09-16 07:19:16 -07:00
i18n.adoc
imap.adoc doc: convert git-imap-send synopsis and options to new style 2026-07-23 14:26:58 -07:00
includeif.adoc
index.adoc
init.adoc setup: rename "init.defaultRefFormat" to "init.defaultRefStorageFormat" 2026-09-09 11:04:31 -07:00
instaweb.adoc
interactive.adoc
log.adoc graph: add --[no-]graph-indent and log.graphIndent 2026-07-14 07:32:51 -07:00
lsrefs.adoc
mailinfo.adoc
mailmap.adoc
maintenance.adoc Merge branch 'ps/tune-rerere-gc' 2026-09-14 14:02:53 -07:00
man.adoc
merge.adoc merge/pull: extend merge.stat configuration variable to cover --compact-summary 2025-06-13 11:54:14 -07:00
mergetool.adoc doc: convert git-difftool manual page to synopsis style 2026-04-06 09:38:18 -07:00
notes.adoc Merge branch 'bc/doc-adoc-not-txt' 2025-02-14 17:53:47 -08:00
pack.adoc doc: fix plural agreement in pack.preferBitmapTips 2026-04-16 21:22:01 -07:00
pager.adoc
pretty.adoc
promisor.adoc Merge branch 'cc/promisor-auto-config-url-more' 2026-07-06 15:50:19 -07:00
protocol.adoc
pull.adoc pull: add pull.autoStash config option 2025-07-21 15:01:21 -07:00
push.adoc doc: clarify push.default=simple behavior 2026-05-26 20:11:29 +09:00
rebase.adoc
receive.adoc
reftable.adoc
remote.adoc Merge branch 'mh/fetch-follow-remote-head-config' 2026-07-06 15:50:22 -07:00
remotes.adoc
repack.adoc repack: introduce `--write-midx=incremental` 2026-05-20 11:31:14 +09:00
replay.adoc doc: replay: move “default” to the right-hand side 2026-07-30 09:15:04 -07:00
rerere.adoc rerere: go on at a conflict when the lock stays busy 2026-09-14 08:03:41 -07:00
revert.adoc
safe.adoc Merge branch 'ta/doc-config-adoc-fixes' 2026-06-17 11:10:11 -07:00
sendemail.adoc doc: convert git-send-email synopsis and options to new style 2026-07-23 14:26:58 -07:00
sequencer.adoc
showbranch.adoc
sideband.adoc Merge branch 'ta/doc-config-adoc-fixes' 2026-06-17 11:10:11 -07:00
sparse.adoc
splitindex.adoc
ssh.adoc
stash.adoc Merge branch 'dk/stash-apply-index' 2025-10-20 14:12:17 -07:00
status.adoc status: clarify how status.compareBranches deduplicates 2026-03-04 10:13:33 -08:00
submodule.adoc doc: fix grammar errors in submodule description 2026-04-16 21:22:01 -07:00
tag.adoc doc: convert git tag to synopsis style 2025-10-05 16:09:03 -07:00
tar.adoc
trace2.adoc
trailer.adoc doc: config: convert trailers section to synopsis style 2026-03-16 15:04:37 -07:00
transfer.adoc
uploadarchive.adoc
uploadpack.adoc builtin/upload-pack: set GIT_NO_LAZY_FETCH to 0 on trusted repo 2026-09-08 10:02:57 -07:00
url.adoc
user.adoc
versionsort.adoc
web.adoc
worktree.adoc worktree add: treat multiple matches with --guess-remote as an error 2026-08-27 10:29:43 -07:00