Junio C Hamano 0f8e75abeb Revert "Merge branch 'en/no-amend-during-conflicts'" ...

This reverts commit a334b7ec86,
reversing changes made to cee3798cb4,
as we found a regression and decided to give ourselves a chance to
fix it better after Git 2.56 final.

  cf. https://lore.kernel.org/git/xmqqik3vc1pc.fsf@gitster.g/

2026-09-23 11:18:51 -07:00

..

config

Merge branch 'ps/tune-rerere-gc'

2026-09-14 14:02:53 -07:00

howto

meson: make GIT_HTML_PATH configurable

2025-11-06 09:58:56 -08:00

includes

…

mergetools

…

RelNotes

Revert "Merge branch 'en/no-amend-during-conflicts'"

2026-09-23 11:18:51 -07:00

technical

Merge branch 'jc/rerere-doc-typofix'

2026-09-02 09:21:59 -07:00

.gitignore

…

asciidoc.conf.in

doc: convert git-bisect to synopsis style

2026-05-25 20:05:44 +09:00

asciidoctor-extensions.rb.in

…

blame-options.adoc

doc: blame-options: convert to new doc format

2026-01-09 06:15:31 -08:00

BreakingChanges.adoc

safe.bareRepository: default to "explicit" with WITH_BREAKING_CHANGES

2026-04-27 14:50:54 +09:00

build-docdep.perl

…

cat-texi.perl

…

cmd-list.sh

…

CodingGuidelines

Merge branch 'jc/doc-timestamps-in-stat'

2026-05-11 10:05:54 +09:00

config.adoc

Merge branch 'kh/doc-replay-config'

2026-08-11 10:07:00 -07:00

date-formats.adoc

doc: document and test @ prefix for raw timestamps

2026-06-02 18:13:12 +09:00

DecisionMaking.adoc

…

diff-algorithm-option.adoc

blame: make diff algorithm configurable

2025-11-17 09:31:59 -08:00

diff-context-options.adoc

diff: document -U without <n> as using default context

2026-03-10 06:17:59 -07:00

diff-format.adoc

diff-format.adoc: mode and hash are 0* for unmerged paths from index only

2026-05-16 22:21:37 +09:00

diff-generate-patch.adoc

…

diff-options.adoc

doc: convert git-format-patch synopsis and options to new style

2026-07-23 14:26:58 -07:00

doc-diff

…

docbook-xsl.css

…

docbook.xsl

…

docinfo-html.in

…

everyday.adoco

…

fetch-options.adoc

Merge branch 'wy/docs-typofixes'

2026-06-16 09:01:03 -07:00

fix-texi.sh

…

for-each-ref-options.adoc

doc: fix some style issues in git-clone and for-each-ref-options

2026-02-05 21:14:05 -08:00

format-patch-caveats.adoc

doc: convert git-am synopsis and options to new style

2026-05-25 20:05:44 +09:00

format-patch-end-of-commit-message.adoc

doc: convert git-am synopsis and options to new style

2026-05-25 20:05:44 +09:00

fsck-msgids.adoc

builtin/fsck: move generic HEAD check into refs_fsck()

2026-01-12 06:55:41 -08:00

generate-mergetool-list.sh

…

git-add.adoc

add: introduce '--resolved' option

2026-07-31 08:52:16 -07:00

git-am.adoc

doc: convert git-am synopsis and options to new style

2026-05-25 20:05:44 +09:00

git-annotate.adoc

…

git-apply.adoc

doc: convert git-apply synopsis and options to new style

2026-05-25 20:05:44 +09:00

git-archimport.adoc

…

git-archive.adoc

archive: document --prefix handling of absolute and parent paths

2026-04-08 11:13:52 -07:00

git-backfill.adoc

pack-objects: support sparse:oid filter with path-walk

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

git-bisect-lk2009.adoc

…

git-bisect.adoc

bisect: add --reset-when-found to leave when done

2026-08-02 16:34:36 -07:00

git-blame.adoc

blame: reserve mark column only if necessary

2026-07-06 07:34:48 -07:00

git-branch.adoc

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

2026-08-05 10:08:28 -07:00

git-bugreport.adoc

…

git-bundle.adoc

…

git-cat-file.adoc

cat-file: unify default format

2026-08-07 18:50:08 -07:00

git-check-attr.adoc

…

git-check-ignore.adoc

…

git-check-mailmap.adoc

…

git-check-ref-format.adoc

…

git-checkout-index.adoc

…

git-checkout.adoc

checkout -m: autostash when switching branches

2026-04-29 21:46:03 +09:00

git-cherry-pick.adoc

doc: cherry-pick: note --no-commit skips CHERRY_PICK_HEAD

2026-09-05 17:46:26 -07:00

git-cherry.adoc

…

git-citool.adoc

…

git-clean.adoc

…

git-clone.adoc

Merge branch 'cc/lop-filter-auto'

2026-02-25 11:54:17 -08:00

git-column.adoc

…

git-commit-graph.adoc

doc: add caveat about turning off commit-graph

2026-05-08 10:22:33 +09:00

git-commit-tree.adoc

…

git-commit.adoc

doc: commit: link to git-status(1) on all format options

2025-11-14 08:56:35 -08:00

git-config.adoc

doc: git-config: escape erroneous highlight markup

2026-06-11 12:08:17 -07:00

git-count-objects.adoc

Merge branch 'ds/doc-count-objects-fix' into maint-2.51

2025-10-14 13:40:54 -07:00

git-credential-cache--daemon.adoc

…

git-credential-cache.adoc

…

git-credential-store.adoc

…

git-credential.adoc

…

git-cvsexportcommit.adoc

…

git-cvsimport.adoc

…

git-cvsserver.adoc

…

git-daemon.adoc

…

git-describe.adoc

doc: convert git-describe manual page to synopsis style

2026-04-06 09:38:19 -07:00

git-diagnose.adoc

…

git-diff-files.adoc

…

git-diff-index.adoc

…

git-diff-pairs.adoc

…

git-diff-tree.adoc

…

git-diff.adoc

…

git-difftool.adoc

doc: convert git-difftool manual page to synopsis style

2026-04-06 09:38:18 -07:00

git-fast-export.adoc

fast-export: standardize usage string and SYNOPSIS

2026-07-13 08:54:29 -07:00

git-fast-import.adoc

fast-import: use parse_options() for command line options

2026-08-11 07:33:17 -07:00

git-fetch-pack.adoc

…

git-fetch.adoc

doc: convert git fetch to synopsis style

2025-11-19 15:00:37 -08:00

git-filter-branch.adoc

…

git-fmt-merge-msg.adoc

…

git-for-each-ref.adoc

…

git-for-each-repo.adoc

…

git-format-patch.adoc

doc: convert git-format-patch synopsis and options to new style

2026-07-23 14:26:58 -07:00

git-format-rev.adoc

doc: format-rev: use [synopsis] on code block

2026-08-17 13:33:06 -07:00

git-fsck-objects.adoc

…

git-fsck.adoc

…

git-fsmonitor--daemon.adoc

fsmonitor: implement filesystem change listener for Linux

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

git-gc.adoc

…

git-get-tar-commit-id.adoc

…

git-grep.adoc

doc: convert git-grep synopsis and options to new style

2026-05-25 20:05:44 +09:00

git-gui.adoc

…

git-hash-object.adoc

…

git-help.adoc

…

git-history.adoc

builtin/history: implement "drop" subcommand

2026-07-03 10:32:47 -07:00

git-hook.adoc

doc: hook: don’t self-link via config include

2026-05-22 09:36:20 +09:00

git-http-backend.adoc

…

git-http-fetch.adoc

http: avoid concurrent appends to partial packs

2026-07-27 12:57:20 -07:00

git-http-push.adoc

…

git-imap-send.adoc

Merge branch 'wf/imap-send-draft'

2026-09-14 14:02:52 -07:00

git-index-pack.adoc

…

git-init-db.adoc

…

git-init.adoc

…

git-instaweb.adoc

…

git-interpret-trailers.adoc

trailers: stop recognizing URLs as trailers

2026-08-21 08:53:27 -07:00

git-last-modified.adoc

last-modified: change default max-depth to 0

2026-01-20 14:13:04 -08:00

git-log.adoc

doc: log: use the same delimiter in description list

2026-04-28 09:46:26 +09:00

git-ls-files.adoc

ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR

2026-05-13 10:25:52 +09:00

git-ls-remote.adoc

…

git-ls-tree.adoc

…

git-mailinfo.adoc

…

git-mailsplit.adoc

…

git-maintenance.adoc

maintenance: add 'is-needed' subcommand

2025-11-10 09:28:48 -08:00

git-merge-base.adoc

…

git-merge-file.adoc

merge-file: honor merge.conflictStyle outside of a repository

2026-02-07 17:04:26 -08:00

git-merge-index.adoc

…

git-merge-one-file.adoc

…

git-merge-tree.adoc

Merge branch 'en/doc-merge-tree-describe-merge-base'

2025-10-10 12:51:46 -07:00

git-merge.adoc

…

git-mergetool--lib.adoc

…

git-mergetool.adoc

…

git-mktag.adoc

…

git-mktree.adoc

…

git-multi-pack-index.adoc

midx: support custom --base for incremental MIDX writes

2026-05-20 11:31:13 +09:00

git-mv.adoc

…

git-name-rev.adoc

…

git-notes.adoc

…

git-p4.adoc

…

git-pack-objects.adoc

pack-objects: support --delta-islands with --path-walk

2026-06-21 16:26:14 -07:00

git-pack-redundant.adoc

…

git-pack-refs.adoc

doc/pack-refs: convert synopsis and options to new style

2026-09-15 09:22:15 -07:00

git-patch-id.adoc

doc: patch-id: see also git-cherry(1)

2026-02-17 10:49:51 -08:00

git-prune-packed.adoc

…

git-prune.adoc

…

git-pull.adoc

Merge branch 'je/doc-pull'

2025-12-14 17:04:37 +09:00

git-push.adoc

push: support pushing to a remote group

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

git-quiltimport.adoc

…

git-range-diff.adoc

Merge branch 'sp/doc-range-diff-takes-notes'

2026-05-31 10:00:39 +09:00

git-read-tree.adoc

…

git-rebase.adoc

rebase: support --trailer

2026-03-06 13:02:20 -08:00

git-receive-pack.adoc

…

git-reflog.adoc

…

git-refs.adoc

doc/refs: backtick-quote commands and options consistently

2026-09-15 09:22:16 -07:00

git-remote-ext.adoc

…

git-remote-fd.adoc

…

git-remote-helpers.adoco

…

git-remote.adoc

doc: convert git-remote to synopsis style

2025-12-21 11:33:10 +09:00

git-repack.adoc

builtin/repack: add guards for --drop-filtered

2026-08-13 13:34:50 -07:00

git-replace.adoc

doc: add caveat about turning off commit-graph

2026-05-08 10:22:33 +09:00

git-replay.adoc

Merge branch 'tc/replay-linearize'

2026-09-10 05:36:17 -07:00

git-repo.adoc

repo: add path.gitdir with absolute and relative suffix formatting

2026-06-23 21:15:52 -07:00

git-request-pull.adoc

doc: convert git-request-pull synopsis and options to new style

2026-07-23 14:26:58 -07:00

git-rerere.adoc

doc: fix singular/plural mismatch in git-rerere

2026-04-16 21:22:01 -07:00

git-reset.adoc

doc: git-reset: clarify git reset <pathspec>

2026-01-06 08:10:14 +09:00

git-restore.adoc

Merge branch 'kh/doc-restore-double-underscores-fix'

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

git-rev-list.adoc

…

git-rev-parse.adoc

Merge branch 'bc/sha1-256-interop-01'

2025-10-22 11:38:58 -07:00

git-revert.adoc

…

git-rm.adoc

…

git-send-email.adoc

doc: convert git-send-email synopsis and options to new style

2026-07-23 14:26:58 -07:00

git-send-pack.adoc

…

git-sh-i18n--envsubst.adoc

…

git-sh-i18n.adoc

…

git-sh-setup.adoc

…

git-shell.adoc

…

git-shortlog.adoc

doc: convert git-shortlog manual page to synopsis style

2026-04-06 09:38:19 -07:00

git-show-branch.adoc

…

git-show-index.adoc

…

git-show-ref.adoc

…

git-show.adoc

doc: convert git-show to synopsis style

2026-02-05 21:14:05 -08:00

git-sparse-checkout.adoc

doc: fix typos via codespell

2026-06-08 00:21:35 +09:00

git-stage.adoc

doc: convert git stage to use synopsis block

2025-12-21 11:33:10 +09:00

git-stash.adoc

stash: reserve exit status 1 for conflicts

2026-09-03 11:32:36 -07:00

git-status.adoc

doc: convert git-status tables to AsciiDoc format

2025-12-21 11:33:10 +09:00

git-stripspace.adoc

…

git-submodule.adoc

doc: convert git-submodule to synopsis style

2026-02-05 21:14:05 -08:00

git-svn.adoc

ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR

2026-05-13 10:25:52 +09:00

git-switch.adoc

checkout -m: autostash when switching branches

2026-04-29 21:46:03 +09:00

git-symbolic-ref.adoc

…

git-tag.adoc

Merge branch 'cc/fast-import-strip-signed-tags'

2025-10-28 10:29:09 -07:00

git-tools.adoc

…

git-unpack-file.adoc

…

git-unpack-objects.adoc

…

git-update-index.adoc

…

git-update-ref.adoc

Merge branch 'sb/doc-update-ref-markup-fix'

2026-01-23 13:34:35 -08:00

git-update-server-info.adoc

…

git-upload-archive.adoc

…

git-upload-pack.adoc

…

git-url-parse.adoc

doc: describe the url-parse builtin

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

git-var.adoc

doc: replace git config --list/-l with list

2026-04-06 09:57:07 -07:00

git-verify-commit.adoc

…

git-verify-pack.adoc

…

git-verify-tag.adoc

…

git-version.adoc

…

git-web--browse.adoc

…

git-whatchanged.adoc

whatchanged: remove not-even-shorter clause

2025-09-17 13:47:24 -07:00

git-worktree.adoc

worktree add: treat multiple matches with --guess-remote as an error

2026-08-27 10:29:43 -07:00

git-write-tree.adoc

…

git.adoc

doc: git: link to the gitdatamodel(7) tutorial

2026-09-05 17:37:49 -07:00

gitattributes.adoc

userdiff: add support for Swift

2026-07-23 07:14:34 -07:00

gitcli.adoc

doc: clarify command equivalence comment

2025-11-04 09:25:51 -08:00

gitcore-tutorial.adoc

…

gitcredentials.adoc

Merge branch 'mh/doc-credential-url-prefix' into maint-2.51

2025-10-15 10:29:35 -07:00

gitcvs-migration.adoc

doc: gitcvs-migration: rephrase “man page”

2026-04-06 09:57:07 -07:00

gitdatamodel.adoc

doc: datamodel: link to the glossary

2026-09-05 17:37:49 -07:00

gitdiffcore.adoc

…

giteveryday.adoc

…

gitfaq.adoc

Merge branch 'bc/doc-stash-import-export'

2026-01-16 12:40:27 -08:00

gitformat-bundle.adoc

…

gitformat-chunk.adoc

…

gitformat-commit-graph.adoc

…

gitformat-index.adoc

ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR

2026-05-13 10:25:52 +09:00

gitformat-loose.adoc

rust: add a new binary object map format

2026-02-07 17:41:03 -08:00

gitformat-pack.adoc

midx: do not require packs to be sorted in lexicographic order

2026-02-24 11:16:33 -08:00

gitformat-signature.adoc

…

gitglossary.adoc

doc: glossary: link four of the terms to gitdatamodel(7)

2026-09-05 17:37:49 -07:00

githooks.adoc

refs: add 'preparing' phase to the reference-transaction hook

2026-03-16 21:00:44 -07:00

gitignore.adoc

ignore: note info/exclude lives in GIT_COMMON_DIR, not GIT_DIR

2026-05-13 10:25:52 +09:00

gitk.adoc

Merge branch 'js/doc-gitk-history' into maint-2.51

2025-10-14 13:40:53 -07:00

gitmailmap.adoc

…

gitmodules.adoc

doc: fix grammar errors in submodule description

2026-04-16 21:22:01 -07:00

gitnamespaces.adoc

…

gitpacking.adoc

Documentation: fix broken sampleRate in gitpacking(7)

2026-05-12 10:36:18 +09:00

gitprotocol-capabilities.adoc

…

gitprotocol-common.adoc

…

gitprotocol-http.adoc

doc: clarify server behavior for invalid 'want' lines in HTTP protocol

2025-11-06 09:45:38 -08:00

gitprotocol-pack.adoc

doc: gitprotocol-pack: normalize italic formatting

2026-03-02 21:35:05 -08:00

gitprotocol-v2.adoc

cat-file: unify default format

2026-08-07 18:50:08 -07:00

gitremote-helpers.adoc

…

gitrepository-layout.adoc

…

gitrevisions.adoc

…

gitsubmodules.adoc

…

gittutorial-2.adoc

…

gittutorial.adoc

doc: replace git config --list/-l with list

2026-04-06 09:57:07 -07:00

gitweb.adoc

…

gitweb.conf.adoc

…

gitworkflows.adoc

…

glossary-content.adoc

doc: glossary: link four of the terms to gitdatamodel(7)

2026-09-05 17:37:49 -07:00

i18n.adoc

…

install-doc-quick.sh

…

install-webdoc.sh

…

line-range-format.adoc

…

line-range-options.adoc

line-log: allow non-patch diff formats with -L

2026-05-29 14:06:21 +09:00

lint-delimited-sections.perl

…

lint-documentation-style.perl

…

lint-fsck-msgids.perl

…

lint-gitlink.perl

lint-gitlink: don't use empty lower bound in .{0,8}

2026-09-08 15:07:01 -07:00

lint-man-end-blurb.perl

…

lint-man-section-order.perl

…

lint-manpages.sh

…

Makefile

Documentation/technical: add paint-down-to-common doc

2026-08-11 07:34:31 -07:00

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage.xsl

…

merge-options.adoc

doc: convert git pull to synopsis style

2025-11-19 15:00:42 -08:00

merge-strategies.adoc

…

meson.build

Merge branch 'mm/git-url-parse'

2026-05-21 12:06:48 +09:00

MyFirstContribution.adoc

Merge branch 'wy/doc-myfirstcontribution-trim-quotes'

2026-07-19 10:42:18 -07:00

MyFirstObjectWalk.adoc

…

object-format-disclaimer.adoc

…

pack-refs-options.adoc

doc/pack-refs: convert synopsis and options to new style

2026-09-15 09:22:15 -07:00

pretty-formats.adoc

docs/pretty-formats: add %(count) and %(total)

2026-03-23 13:06:58 -07:00

pretty-options.adoc

doc: do not break sentences into "lego" pieces

2025-10-05 16:10:53 -07:00

pull-fetch-param.adoc

doc: pull-fetch-param typofix

2025-11-24 10:55:48 -08:00

ref-reachability-filters.adoc

…

ref-storage-format.adoc

docs: correct information about reftable

2026-04-08 07:18:56 -07:00

rerere-options.adoc

doc: rerere-options.adoc: link to git-rerere(1)

2026-02-10 12:27:07 -08:00

rev-list-description.adoc

…

rev-list-options.adoc

rev-list: add --missing-only option to filter output

2026-09-03 14:39:41 -07:00

ReviewingGuidelines.adoc

…

revisions.adoc

remote: find tracking branches for URL push destinations

2026-07-22 11:29:49 -07:00

scalar.adoc

scalar: document config settings

2025-12-16 09:42:44 +09:00

sequencer.adoc

…

signoff-option.adoc

signoff-option: linkify the reference to gitfaq

2025-12-19 21:51:01 +09:00

SubmittingPatches

Merge branch 'ss/submittingpatches-typofix'

2026-08-25 10:53:32 -07:00

texi.xsl

…

ToolsForGit.adoc

…

trace2-target-values.adoc

…

transfer-data-leaks.adoc

…

urls-remotes.adoc

doc: convert git pull to synopsis style

2025-11-19 15:00:42 -08:00

urls.adoc

…

user-manual.adoc

doc: replace git config --list/-l with list

2026-04-06 09:57:07 -07:00