Sergey Organov 364bc11fe5 doc/diff-options: document new --diff-merges features ... Document changes in -m and --diff-merges=m semantics, as well as new --diff-merges=on option. Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2021-04-16 23:38:35 -07:00
..
config	diff-merges: introduce log.diffMerges config variable	2021-04-16 23:38:35 -07:00
howto
RelNotes	Git 2.31.1	2021-03-26 14:49:41 -07:00
technical	Merge branch 'hn/reftable-tables-doc-update'	2021-03-01 14:02:57 -08:00
.gitattributes
.gitignore
asciidoc.conf
asciidoctor-extensions.rb
blame-options.txt	blame-options.txt: camelcase blame.blankBoundary	2021-02-24 15:21:25 -08:00
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt	Merge branch 'km/config-doc-typofix'	2021-03-19 15:25:38 -07:00
date-formats.txt	doc: mention approxidates for git-commit --date	2021-02-23 13:33:02 -08:00
diff-format.txt
diff-generate-patch.txt
diff-options.txt	doc/diff-options: document new --diff-merges features	2021-04-16 23:38:35 -07:00
doc-diff
docbook-xsl.css
docbook.xsl
everyday.txto
fetch-options.txt
fix-texi.perl
git-add.txt
git-am.txt	i18n.txt: camel case and monospace "i18n.commitEncoding"	2021-02-24 15:21:25 -08:00
git-annotate.txt
git-apply.txt
git-archimport.txt
git-archive.txt
git-bisect-lk2009.txt
git-bisect.txt
git-blame.txt
git-branch.txt	Merge branch 'jc/maint-column-doc-typofix'	2021-02-25 16:43:30 -08:00
git-bugreport.txt
git-bundle.txt
git-cat-file.txt
git-check-attr.txt
git-check-ignore.txt
git-check-mailmap.txt
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt
git-column.txt
git-commit-graph.txt
git-commit-tree.txt
git-commit.txt
git-config.txt
git-count-objects.txt
git-credential-cache--daemon.txt
git-credential-cache.txt
git-credential-store.txt
git-credential.txt
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt
git-daemon.txt
git-describe.txt
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt
git-difftool.txt	difftool.c: learn a new way start at specified file	2021-02-22 13:35:49 -08:00
git-fast-export.txt
git-fast-import.txt
git-fetch-pack.txt
git-fetch.txt
git-filter-branch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt	ref-filter: use pretty.c logic for trailers	2021-02-15 16:48:38 -08:00
git-for-each-repo.txt
git-format-patch.txt
git-fsck-objects.txt
git-fsck.txt
git-gc.txt	docs: clarify that refs/notes/ do not keep the attached objects alive	2021-02-10 23:43:55 -08:00
git-get-tar-commit-id.txt
git-grep.txt
git-gui.txt
git-hash-object.txt
git-help.txt
git-http-backend.txt
git-http-fetch.txt	http-fetch: allow custom index-pack args	2021-02-22 12:07:40 -08:00
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	Merge branch 'jt/transfer-fsck-across-packs'	2021-03-01 14:02:57 -08:00
git-init-db.txt
git-init.txt
git-instaweb.txt
git-interpret-trailers.txt
git-log.txt
git-ls-files.txt
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt	i18n.txt: camel case and monospace "i18n.commitEncoding"	2021-02-24 15:21:25 -08:00
git-mailsplit.txt
git-maintenance.txt	maintenance: add pack-refs task	2021-02-09 23:09:24 -08:00
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt
git-mergetool--lib.txt	mergetool: break setup_tool out into separate initialization function	2021-02-09 14:09:16 -08:00
git-mergetool.txt	doc: describe mergetool configuration in git-mergetool(1)	2021-03-13 15:34:32 -08:00
git-mktag.txt
git-mktree.txt
git-multi-pack-index.txt
git-mv.txt
git-name-rev.txt
git-notes.txt
git-p4.txt
git-pack-objects.txt	doc: mention bigFileThreshold for packing	2021-02-22 13:18:30 -08:00
git-pack-redundant.txt
git-pack-refs.txt
git-patch-id.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt
git-push.txt
git-quiltimport.txt
git-range-diff.txt	Merge branch 'js/range-diff-one-side-only'	2021-02-17 17:21:41 -08:00
git-read-tree.txt
git-rebase.txt
git-receive-pack.txt
git-reflog.txt
git-remote-ext.txt
git-remote-fd.txt
git-remote-helpers.txto
git-remote.txt
git-repack.txt	doc: mention bigFileThreshold for packing	2021-02-22 13:18:30 -08:00
git-replace.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt
git-restore.txt
git-rev-list.txt	docs/rev-list: add some examples of --disk-usage	2021-02-17 16:25:29 -08:00
git-rev-parse.txt
git-revert.txt
git-rm.txt
git-send-email.txt
git-send-pack.txt
git-sh-i18n--envsubst.txt
git-sh-i18n.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt	mailmap: only look for .mailmap in work tree	2021-02-10 13:34:51 -08:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt
git-show.txt
git-sparse-checkout.txt
git-stage.txt
git-stash.txt	git-stash.txt: be explicit about subcommand options	2021-02-11 13:34:58 -08:00
git-status.txt	Documentation: typofix --column description	2021-02-19 19:36:47 -08:00
git-stripspace.txt
git-submodule.txt
git-svn.txt
git-switch.txt
git-symbolic-ref.txt
git-tag.txt	Documentation: typofix --column description	2021-02-19 19:36:47 -08:00
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-commit.txt
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt
git-whatchanged.txt
git-worktree.txt
git-write-tree.txt
git.txt	git.txt: fix monospace rendering	2021-02-18 10:53:33 -08:00
gitattributes.txt
gitcli.txt
gitcore-tutorial.txt
gitcredentials.txt
gitcvs-migration.txt
gitdiffcore.txt	Merge branch 'en/diffcore-rename'	2021-03-01 14:02:56 -08:00
giteveryday.txt
gitfaq.txt
gitglossary.txt
githooks.txt
gitignore.txt
gitk.txt
gitmailmap.txt	gitmailmap.txt: fix rendering of e-mail addresses	2021-02-18 10:53:33 -08:00
gitmodules.txt
gitnamespaces.txt
gitremote-helpers.txt
gitrepository-layout.txt
gitrevisions.txt
gitsubmodules.txt
gittutorial-2.txt
gittutorial.txt
gitweb.conf.txt
gitweb.txt
gitworkflows.txt
glossary-content.txt
howto-index.sh
i18n.txt	i18n.txt: camel case and monospace "i18n.commitEncoding"	2021-02-24 15:21:25 -08:00
install-doc-quick.sh
install-webdoc.sh
line-range-format.txt
line-range-options.txt
lint-gitlink.perl
Makefile
manpage-base-url.xsl.in
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage.xsl
merge-options.txt
merge-strategies.txt
MyFirstContribution.txt
MyFirstObjectWalk.txt
object-format-disclaimer.txt
pretty-formats.txt
pretty-options.txt
pull-fetch-param.txt
ref-reachability-filters.txt
rev-list-description.txt
rev-list-options.txt	Merge branch 'ma/doc-markup-fix'	2021-02-25 16:43:30 -08:00
revisions.txt
sequencer.txt
signoff-option.txt
SubmittingPatches
texi.xsl
trace2-target-values.txt
transfer-data-leaks.txt
urls-remotes.txt
urls.txt
user-manual.conf
user-manual.txt