Lucas Seiki Oshiro 4ebba56419 merge-strategies.adoc: detail submodule merge ...

Submodule merges are, in general, similar to other merges based on oid
three-way-merge. When a conflict happens, however, Git has two special
cases (introduced in 68d03e4a6e) on handling the conflict before
yielding it to the user. From the merge-ort and merge-recursive sources:

- "Case #1: a is contained in b or vice versa": both strategies try to
perform a fast-forward in the submodules if the commit referred by the
conflicted submodule is descendant of another;

- "Case #2: There are one or more merges that contain a and b in the
submodule.  If there is only one, then present it as a suggestion to the
user, but leave it marked unmerged so the user needs to confirm the
resolution."

Add a small paragraph on merge-strategies.adoc describing this behavior.

Helped-by: Junio C Hamano <gitster@pobox.com>
Helped-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Lucas Seiki Oshiro <lucasseikioshiro@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2025-02-25 16:06:06 -08:00

..

config

Merge branch 'en/doc-renormalize'

2025-02-21 10:35:53 -08:00

howto

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

includes

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

mergetools

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

RelNotes

The twelfth batch

2025-02-18 15:30:33 -08:00

technical

Merge branch 'ds/backfill'

2025-02-18 15:30:31 -08:00

.gitattributes

…

.gitignore

Remove obsolete ".txt" extensions for AsciiDoc files

2025-01-21 12:56:10 -08:00

asciidoc.conf.in

Documentation: inline user-manual.conf

2024-12-27 08:28:10 -08:00

asciidoctor-extensions.rb.in

asciidoctor-extensions.rb.in: inject GIT_DATE

2024-12-20 17:34:35 -08:00

blame-options.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

BreakingChanges.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

build-docdep.perl

Documentation: allow sourcing generated includes from separate dir

2024-12-07 07:52:12 +09:00

cat-texi.perl

…

cmd-list.perl

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

CodingGuidelines

Merge branch 'ps/build'

2024-12-15 17:54:33 -08:00

config.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

date-formats.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

DecisionMaking.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

diff-format.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

diff-generate-patch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

diff-options.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

doc-diff

…

docbook-xsl.css

…

docbook.xsl

…

docinfo-html.in

Doc: fix Asciidoctor css workaround

2024-07-23 11:02:52 -07:00

everyday.adoco

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

fetch-options.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

fix-texi.perl

…

fsck-msgids.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

generate-mergetool-list.sh

Documentation: extract script to generate a list of mergetools

2024-12-07 07:52:13 +09:00

git-add.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-am.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-annotate.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-apply.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-archimport.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-archive.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-backfill.adoc

Merge branch 'ds/backfill'

2025-02-18 15:30:31 -08:00

git-bisect-lk2009.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-bisect.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-blame.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-branch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-bugreport.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-bundle.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-cat-file.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-check-attr.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-check-ignore.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-check-mailmap.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-check-ref-format.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-checkout-index.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-checkout.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-cherry-pick.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-cherry.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-citool.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-clean.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-clone.adoc

Merge branch 'tc/clone-single-revision'

2025-02-14 17:53:48 -08:00

git-column.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-commit-graph.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-commit-tree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-commit.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-config.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-count-objects.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-credential-cache--daemon.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-credential-cache.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-credential-store.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-credential.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-cvsexportcommit.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-cvsimport.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-cvsserver.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-daemon.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-describe.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-diagnose.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-diff-files.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-diff-index.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-diff-tree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-diff.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-difftool.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fast-export.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fast-import.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fetch-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fetch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-filter-branch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fmt-merge-msg.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-for-each-ref.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-for-each-repo.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-format-patch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fsck-objects.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fsck.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-fsmonitor--daemon.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-gc.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-get-tar-commit-id.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-grep.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-gui.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-hash-object.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-help.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-hook.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-http-backend.adoc

Merge branch 'ps/doc-http-upload-archive-service'

2025-02-14 17:53:49 -08:00

git-http-fetch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-http-push.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-imap-send.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-index-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-init-db.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-init.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-instaweb.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-interpret-trailers.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-log.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-ls-files.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-ls-remote.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-ls-tree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-mailinfo.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-mailsplit.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-maintenance.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-merge-base.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-merge-file.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-merge-index.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-merge-one-file.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-merge-tree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-merge.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-mergetool--lib.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-mergetool.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-mktag.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-mktree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-multi-pack-index.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-mv.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-name-rev.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-notes.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-p4.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-pack-objects.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-pack-redundant.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-pack-refs.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-patch-id.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-prune-packed.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-prune.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-pull.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-push.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-quiltimport.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-range-diff.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-read-tree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-rebase.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-receive-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-reflog.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-refs.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-remote-ext.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-remote-fd.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-remote-helpers.adoco

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-remote.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-repack.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-replace.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-replay.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-request-pull.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-rerere.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-reset.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-restore.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-rev-list.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-rev-parse.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-revert.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-rm.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-send-email.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-send-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-sh-i18n--envsubst.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-sh-i18n.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-sh-setup.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-shell.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-shortlog.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-show-branch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-show-index.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

git-show-ref.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-show.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-sparse-checkout.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-stage.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-stash.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-status.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-stripspace.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-submodule.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-svn.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-switch.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-symbolic-ref.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-tag.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-tools.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-unpack-file.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-unpack-objects.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-update-index.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-update-ref.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-update-server-info.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-upload-archive.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-upload-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-var.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-verify-commit.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-verify-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-verify-tag.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-version.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-web--browse.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-whatchanged.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-worktree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git-write-tree.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

git.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitattributes.adoc

Merge branch 'en/doc-renormalize'

2025-02-21 10:35:53 -08:00

gitcli.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

gitcore-tutorial.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitcredentials.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

gitcvs-migration.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitdiffcore.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

giteveryday.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitfaq.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitformat-bundle.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitformat-chunk.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitformat-commit-graph.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitformat-index.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitformat-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitformat-signature.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitglossary.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

githooks.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitignore.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitk.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitmailmap.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitmodules.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitnamespaces.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitpacking.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitprotocol-capabilities.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitprotocol-common.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitprotocol-http.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitprotocol-pack.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitprotocol-v2.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitremote-helpers.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitrepository-layout.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

gitrevisions.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitsubmodules.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gittutorial-2.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gittutorial.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitweb.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitweb.conf.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

gitworkflows.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

glossary-content.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

i18n.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

install-doc-quick.sh

…

install-webdoc.sh

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

line-range-format.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

line-range-options.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

lint-fsck-msgids.perl

…

lint-gitlink.perl

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

lint-man-end-blurb.perl

…

lint-man-section-order.perl

…

lint-manpages.sh

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

Makefile

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

manpage-bold-literal.xsl

…

manpage-normal.xsl

…

manpage.xsl

…

merge-options.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

merge-strategies.adoc

merge-strategies.adoc: detail submodule merge

2025-02-25 16:06:06 -08:00

meson.build

Merge branch 'ds/backfill'

2025-02-18 15:30:31 -08:00

MyFirstContribution.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

MyFirstObjectWalk.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

object-format-disclaimer.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

pretty-formats.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

pretty-options.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

pull-fetch-param.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

ref-reachability-filters.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

ref-storage-format.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

rerere-options.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

rev-list-description.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

rev-list-options.adoc

Merge branch 'jt/rev-list-missing-print-info'

2025-02-18 15:30:32 -08:00

ReviewingGuidelines.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

revisions.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

scalar.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

sequencer.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

signoff-option.adoc

Merge branch 'bc/doc-adoc-not-txt'

2025-02-14 17:53:47 -08:00

SubmittingPatches

Merge branch 'as/gitk-git-gui-repo-update'

2024-12-28 10:11:42 -08:00

texi.xsl

…

ToolsForGit.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

trace2-target-values.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

transfer-data-leaks.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

urls-remotes.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

urls.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00

user-manual.adoc

doc: use .adoc extension for AsciiDoc files

2025-01-21 12:56:06 -08:00