dilim/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-08-09 09:34:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
0c6ee971fbed2cdd4a88721e116cc3867503418e
git/Documentation
History
Johannes Schindelin 5f43cf5b2e merge-tree: accept 3 trees as arguments 
When specifying a merge base explicitly, there is actually no good
reason why the inputs need to be commits: that's only needed if the
merge base has to be deduced from the commit graph.

This commit is best viewed with `--color-moved
--color-moved-ws=allow-indentation-change`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2024-01-29 09:20:49 -08:00
..
config
Merge branch 'mp/rebase-label-length-limit' into maint-2.42
2023-11-02 16:53:14 +09:00
howto
documentation: fix choice of article
2023-10-09 12:06:29 -07:00
includes
…
mergetools
documentation: fix singular vs. plural
2023-10-09 12:06:29 -07:00
RelNotes
Git 2.43
2023-11-20 10:28:15 +09:00
technical
documentation: add missing quotes
2023-10-09 12:06:47 -07:00
.gitattributes
…
.gitignore
…
asciidoc.conf
…
asciidoctor-extensions.rb
…
blame-options.txt
…
build-docdep.perl
…
cat-texi.perl
…
cmd-list.perl
…
CodingGuidelines
Merge branch 'jc/update-list-references-to-lore'
2023-10-30 07:09:56 +09:00
config.txt
Merge branch 'jc/attr-tree-config'
2023-10-30 07:09:55 +09:00
date-formats.txt
…
diff-format.txt
…
diff-generate-patch.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
diff-options.txt
Merge branch 'so/diff-doc-for-patch-update' into maint-2.42
2023-11-02 16:53:17 +09:00
doc-diff
…
docbook-xsl.css
…
docbook.xsl
…
everyday.txto
…
fetch-options.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
fix-texi.perl
…
fsck-msgids.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-add.txt
…
git-am.txt
Merge branch 'jc/am-doc-whitespace-action-fix' into maint-2.42
2023-11-02 16:53:27 +09:00
git-annotate.txt
…
git-apply.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-archimport.txt
…
git-archive.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-bisect-lk2009.txt
…
git-bisect.txt
doc/git-bisect: clarify git bisect run syntax
2023-10-23 13:04:47 -07:00
git-blame.txt
documentation: fix whitespace issues
2023-10-09 12:06:29 -07:00
git-branch.txt
doc: fix some typos, grammar and wording issues
2023-10-05 12:55:38 -07:00
git-bugreport.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-bundle.txt
…
git-cat-file.txt
doc/cat-file: make synopsis and description less confusing
2023-10-09 12:46:33 -07:00
git-check-attr.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-check-ignore.txt
documentation: fix whitespace issues
2023-10-09 12:06:29 -07:00
git-check-mailmap.txt
…
git-check-ref-format.txt
documentation: add missing fullstops
2023-10-09 12:06:47 -07:00
git-checkout-index.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-checkout.txt
documentation: add missing words
2023-10-09 12:06:29 -07:00
git-cherry-pick.txt
…
git-cherry.txt
…
git-citool.txt
…
git-clean.txt
Merge branch 'ch/clean-docfix' into maint-2.42
2023-11-02 16:53:25 +09:00
git-clone.txt
…
git-column.txt
…
git-commit-graph.txt
…
git-commit-tree.txt
…
git-commit.txt
doc: correct the 50 characters soft limit
2023-09-28 10:49:23 -07:00
git-config.txt
git-config: fix misworded --type=path explanation
2023-09-15 14:09:37 -07:00
git-count-objects.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-credential-cache--daemon.txt
…
git-credential-cache.txt
documentation: add missing words
2023-10-09 12:06:29 -07:00
git-credential-store.txt
documentation: add missing words
2023-10-09 12:06:29 -07:00
git-credential.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-cvsexportcommit.txt
…
git-cvsimport.txt
…
git-cvsserver.txt
…
git-daemon.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-describe.txt
…
git-diagnose.txt
…
git-diff-files.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-diff-index.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-diff-tree.txt
documentation: add missing fullstops
2023-10-09 12:06:47 -07:00
git-diff.txt
…
git-difftool.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-fast-export.txt
…
git-fast-import.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-fetch-pack.txt
documentation: add missing words
2023-10-09 12:06:29 -07:00
git-fetch.txt
…
git-filter-branch.txt
…
git-fmt-merge-msg.txt
…
git-for-each-ref.txt
ref-filter: add mailmap support
2023-09-25 14:52:34 -07:00
git-for-each-repo.txt
…
git-format-patch.txt
documentation: fix subject/verb agreement
2023-10-09 12:06:29 -07:00
git-fsck-objects.txt
…
git-fsck.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-fsmonitor--daemon.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-gc.txt
builtin/repack.c: implement support for --max-cruft-size
2023-10-05 13:26:11 -07:00
git-get-tar-commit-id.txt
documentation: fix typos
2023-10-09 12:06:24 -07:00
git-grep.txt
documentation: fix typos
2023-10-09 12:06:24 -07:00
git-gui.txt
…
git-hash-object.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-help.txt
documentation: add missing fullstops
2023-10-09 12:06:47 -07:00
git-hook.txt
documentation: fix capitalization
2023-10-09 12:06:29 -07:00
git-http-backend.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-http-fetch.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-http-push.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-imap-send.txt
…
git-index-pack.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-init-db.txt
…
git-init.txt
documentation: fix punctuation
2023-10-09 12:06:29 -07:00
git-instaweb.txt
…
git-interpret-trailers.txt
trailer doc: <token> is a <key> or <keyAlias>, not both
2023-09-07 23:04:44 -07:00
git-log.txt
diff-merges: introduce '--dd' option
2023-10-09 12:47:29 -07:00
git-ls-files.txt
documentation: fix punctuation
2023-10-09 12:06:29 -07:00
git-ls-remote.txt
…
git-ls-tree.txt
Merge branch 'rs/doc-ls-tree-hex-literal'
2023-06-22 16:29:07 -07:00
git-mailinfo.txt
…
git-mailsplit.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-maintenance.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-merge-base.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-merge-file.txt
merge-file: add an option to process object IDs
2023-11-02 08:51:40 +09:00
git-merge-index.txt
…
git-merge-one-file.txt
…
git-merge-tree.txt
merge-tree: accept 3 trees as arguments
2024-01-29 09:20:49 -08:00
git-merge.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-mergetool--lib.txt
documentation: fix capitalization
2023-10-09 12:06:29 -07:00
git-mergetool.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-mktag.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-mktree.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-multi-pack-index.txt
…
git-mv.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-name-rev.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-notes.txt
notes doc: tidy up --no-stripspace paragraph
2023-08-16 11:37:25 -07:00
git-p4.txt
…
git-pack-objects.txt
pack-objects: allow --filter without --stdout
2023-10-02 14:54:29 -07:00
git-pack-redundant.txt
…
git-pack-refs.txt
…
git-patch-id.txt
…
git-prune-packed.txt
documentation: add missing words
2023-10-09 12:06:29 -07:00
git-prune.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-pull.txt
…
git-push.txt
Merge branch 'ms/doc-push-fix' into maint-2.42
2023-11-02 16:53:28 +09:00
git-quiltimport.txt
documentation: add missing quotes
2023-10-09 12:06:47 -07:00
git-range-diff.txt
Merge branch 'sn/typo-grammo-phraso-fixes'
2023-10-30 07:09:55 +09:00
git-read-tree.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-rebase.txt
am, rebase: fix arghelp syntax of --empty
2023-10-29 12:10:45 +09:00
git-receive-pack.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-reflog.txt
…
git-remote-ext.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-remote-fd.txt
documentation: add missing parenthesis
2023-10-09 12:06:47 -07:00
git-remote-helpers.txto
…
git-remote.txt
…
git-repack.txt
Merge branch 'ps/git-repack-doc-fixes'
2023-10-30 07:09:57 +09:00
git-replace.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-request-pull.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-rerere.txt
…
git-reset.txt
…
git-restore.txt
documentation: add missing words
2023-10-09 12:06:29 -07:00
git-rev-list.txt
documentation: fix subject/verb agreement
2023-10-09 12:06:29 -07:00
git-rev-parse.txt
documentation: use clearer prepositions
2023-10-09 12:06:29 -07:00
git-revert.txt
git-revert.txt: add discussion
2023-09-02 15:21:44 -07:00
git-rm.txt
documentation: fix apostrophe usage
2023-10-09 12:06:29 -07:00
git-send-email.txt
Merge branch 'jk/send-email-fix-addresses-from-composed-messages'
2023-10-30 07:09:59 +09:00
git-send-pack.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-sh-i18n--envsubst.txt
…
git-sh-i18n.txt
…
git-sh-setup.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-shell.txt
…
git-shortlog.txt
…
git-show-branch.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-show-index.txt
…
git-show-ref.txt
builtin/show-ref: add new mode to check for reference existence
2023-11-01 12:09:01 +09:00
git-show.txt
documentation: fix singular vs. plural
2023-10-09 12:06:29 -07:00
git-sparse-checkout.txt
…
git-stage.txt
…
git-stash.txt
…
git-status.txt
Merge branch 'en/docfixes'
2023-10-23 13:56:37 -07:00
git-stripspace.txt
documentation: fix capitalization
2023-10-09 12:06:29 -07:00
git-submodule.txt
doc: highlight that .gitmodules does not support !command
2023-07-25 14:55:07 -07:00
git-svn.txt
…
git-switch.txt
…
git-symbolic-ref.txt
documentation: fix subject/verb agreement
2023-10-09 12:06:29 -07:00
git-tag.txt
…
git-tools.txt
…
git-unpack-file.txt
…
git-unpack-objects.txt
…
git-update-index.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
git-update-ref.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-update-server-info.txt
documentation: fix capitalization
2023-10-09 12:06:29 -07:00
git-upload-archive.txt
…
git-upload-pack.txt
documentation: fix typos
2023-10-09 12:06:24 -07:00
git-var.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
git-verify-commit.txt
…
git-verify-pack.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-verify-tag.txt
…
git-version.txt
…
git-web--browse.txt
…
git-whatchanged.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
git-worktree.txt
doc/git-worktree: mention "refs/rewritten" as per-worktree refs
2023-10-10 09:23:16 -07:00
git-write-tree.txt
…
git.txt
Merge branch 'ps/do-not-trust-commit-graph-blindly-for-existence'
2023-11-08 11:03:59 +09:00
gitattributes.txt
doc: fix some typos, grammar and wording issues
2023-10-05 12:55:38 -07:00
gitcli.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
gitcore-tutorial.txt
…
gitcredentials.txt
Merge branch 'mh/doc-credential-helpers'
2023-07-18 07:28:52 -07:00
gitcvs-migration.txt
…
gitdiffcore.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
giteveryday.txt
Merge branch 'sn/typo-grammo-phraso-fixes'
2023-10-30 07:09:55 +09:00
gitfaq.txt
…
gitformat-bundle.txt
documentation: fix subject/verb agreement
2023-10-09 12:06:29 -07:00
gitformat-chunk.txt
documentation: fix verb tense
2023-10-09 12:06:29 -07:00
gitformat-commit-graph.txt
…
gitformat-index.txt
…
gitformat-pack.txt
Merge branch 'tb/format-pack-doc-update'
2023-11-08 11:04:00 +09:00
gitformat-signature.txt
…
gitglossary.txt
…
githooks.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
gitignore.txt
Merge branch 'jc/gitignore-doc-pattern-markup'
2023-07-27 15:26:37 -07:00
gitk.txt
doc/gitk: s/sticked/stuck/
2023-10-05 12:55:38 -07:00
gitmailmap.txt
…
gitmodules.txt
doc: highlight that .gitmodules does not support !command
2023-07-25 14:55:07 -07:00
gitnamespaces.txt
…
gitprotocol-capabilities.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
gitprotocol-common.txt
documentation: remove extraneous words
2023-10-09 12:06:29 -07:00
gitprotocol-http.txt
documentation: remove extraneous words
2023-10-09 12:06:29 -07:00
gitprotocol-pack.txt
documentation: fix subject/verb agreement
2023-10-09 12:06:29 -07:00
gitprotocol-v2.txt
documentation: add missing words
2023-10-09 12:06:29 -07:00
gitremote-helpers.txt
…
gitrepository-layout.txt
…
gitrevisions.txt
…
gitsubmodules.txt
documentation: fix singular vs. plural
2023-10-09 12:06:29 -07:00
gittutorial-2.txt
…
gittutorial.txt
doc: correct the 50 characters soft limit (+)
2023-10-09 12:07:26 -07:00
gitweb.conf.txt
documentation: fix verb tense
2023-10-09 12:06:29 -07:00
gitweb.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
gitworkflows.txt
…
glossary-content.txt
Merge branch 'vd/glossary-dereference-peel'
2023-11-20 09:57:23 +09:00
howto-index.sh
…
i18n.txt
documentation: fix subject/verb agreement
2023-10-09 12:06:29 -07:00
install-doc-quick.sh
…
install-webdoc.sh
…
line-range-format.txt
…
line-range-options.txt
…
lint-fsck-msgids.perl
…
lint-gitlink.perl
…
lint-man-end-blurb.perl
…
lint-man-section-order.perl
…
Makefile
…
manpage-bold-literal.xsl
…
manpage-normal.xsl
…
manpage.xsl
…
merge-options.txt
…
merge-strategies.txt
…
MyFirstContribution.txt
Include gettext.h in MyFirstContribution tutorial
2023-10-28 09:02:06 +09:00
MyFirstObjectWalk.txt
Merge branch 'vd/adjust-mfow-doc-to-updated-headers'
2023-07-17 11:30:42 -07:00
object-format-disclaimer.txt
doc: sha256 is no longer experimental
2023-07-31 09:11:04 -07:00
pretty-formats.txt
pretty: add pointer and tag options to %(decorate)
2023-08-21 11:40:10 -07:00
pretty-options.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
pull-fetch-param.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
ref-reachability-filters.txt
…
rerere-options.txt
…
rev-list-description.txt
…
rev-list-options.txt
documentation: add missing article
2023-10-09 12:06:29 -07:00
ReviewingGuidelines.txt
documentation: remove unnecessary hyphens
2023-10-09 12:06:29 -07:00
revisions.txt
…
scalar.txt
scalar: add --[no-]src option
2023-08-28 09:16:06 -07:00
sequencer.txt
…
signoff-option.txt
…
SubmittingPatches
Merge branch 'ar/submitting-patches-doc-update'
2023-11-07 10:26:42 +09:00
texi.xsl
…
ToolsForGit.txt
documentation: add some commas where they are helpful
2023-10-09 12:06:44 -07:00
trace2-target-values.txt
…
transfer-data-leaks.txt
…
urls-remotes.txt
documentation: fix singular vs. plural
2023-10-09 12:06:29 -07:00
urls.txt
documentation: wording improvements
2023-10-09 12:04:21 -07:00
user-manual.conf
…
user-manual.txt
doc: correct the 50 characters soft limit (+)
2023-10-09 12:07:26 -07:00