Junio C Hamano 4ce498baa3 Merge branch 'en/zdiff3' ... "Zealous diff3" style of merge conflict presentation has been added. * en/zdiff3: update documentation for new zdiff3 conflictStyle xdiff: implement a zealous diff3, or "zdiff3"		2021-12-15 09:39:47 -08:00
..
config	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
howto
RelNotes	The second batch	2021-12-10 14:35:16 -08:00
technical	Merge branch 'en/zdiff3'	2021-12-15 09:39:47 -08:00
.gitattributes
.gitignore
asciidoc.conf
asciidoctor-extensions.rb
blame-options.txt
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines
config.txt
date-formats.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
diff-format.txt
diff-generate-patch.txt
diff-options.txt
doc-diff
docbook-xsl.css
docbook.xsl
everyday.txto
fetch-options.txt
fix-texi.perl
git-add.txt
git-am.txt
git-annotate.txt
git-apply.txt
git-archimport.txt	doc: split placeholders as individual tokens	2021-10-28 09:57:09 -07:00
git-archive.txt	archive: describe compression level option	2021-10-25 10:08:23 -07:00
git-bisect-lk2009.txt
git-bisect.txt
git-blame.txt
git-branch.txt
git-bugreport.txt
git-bundle.txt	git-bundle.txt: add missing words and punctuation	2021-10-27 17:06:12 -07:00
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	Merge branch 'en/zdiff3'	2021-12-15 09:39:47 -08:00
git-cherry-pick.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-column.txt
git-commit-graph.txt
git-commit-tree.txt
git-commit.txt	Document positive variant of commit and merge option "--no-verify"	2021-10-29 11:22:56 -07:00
git-config.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
git-count-objects.txt
git-credential-cache--daemon.txt
git-credential-cache.txt
git-credential-store.txt
git-credential.txt	doc: fix git credential synopsis	2021-10-28 09:57:09 -07:00
git-cvsexportcommit.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
git-cvsimport.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-cvsserver.txt
git-daemon.txt
git-describe.txt
git-diff-files.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-diff-index.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-diff-tree.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-diff.txt
git-difftool.txt
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
git-for-each-repo.txt
git-format-patch.txt
git-fsck-objects.txt
git-fsck.txt	doc: use three dots for indicating repetition instead of star	2021-11-09 09:39:11 -08:00
git-gc.txt
git-get-tar-commit-id.txt
git-grep.txt
git-gui.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
git-hash-object.txt
git-help.txt	Merge branch 'ja/doc-cleanup'	2021-12-10 14:35:03 -08:00
git-http-backend.txt
git-http-fetch.txt	doc: uniformize <URL> placeholders' case	2021-11-09 09:39:11 -08:00
git-http-push.txt	doc: git-http-push: describe the refs as pattern pairs	2021-11-09 09:39:11 -08:00
git-imap-send.txt
git-index-pack.txt
git-init-db.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-init.txt	init doc: --shared=0xxx does not give umask but perm bits	2021-11-09 09:39:11 -08:00
git-instaweb.txt
git-interpret-trailers.txt
git-log.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-ls-files.txt	doc: git-ls-files: express options as optional alternatives	2021-11-09 09:39:11 -08:00
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt
git-maintenance.txt
git-merge-base.txt
git-merge-file.txt	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
git-merge-index.txt	doc: use three dots for indicating repetition instead of star	2021-11-09 09:39:11 -08:00
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
git-mergetool--lib.txt
git-mergetool.txt
git-mktag.txt
git-mktree.txt
git-multi-pack-index.txt	git-multi-pack-index.txt: change "folder" to "directory"	2021-10-25 11:06:56 -07:00
git-mv.txt
git-name-rev.txt
git-notes.txt
git-p4.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-pack-objects.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
git-pack-redundant.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
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
git-read-tree.txt
git-rebase.txt	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
git-receive-pack.txt
git-reflog.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
git-remote-ext.txt
git-remote-fd.txt
git-remote-helpers.txto
git-remote.txt	doc: uniformize <URL> placeholders' case	2021-11-09 09:39:11 -08:00
git-repack.txt
git-replace.txt
git-request-pull.txt	doc: uniformize <URL> placeholders' case	2021-11-09 09:39:11 -08:00
git-rerere.txt
git-reset.txt
git-restore.txt	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
git-rev-list.txt
git-rev-parse.txt
git-revert.txt
git-rm.txt
git-send-email.txt	send-email docs: add format-patch options	2021-10-28 09:06:15 -07:00
git-send-pack.txt
git-sh-i18n--envsubst.txt
git-sh-i18n.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt
git-show.txt
git-sparse-checkout.txt	Merge branch 'ja/doc-cleanup'	2021-12-10 14:35:03 -08:00
git-stage.txt	doc: express grammar placeholders between angle brackets	2021-11-09 09:39:11 -08:00
git-stash.txt
git-status.txt
git-stripspace.txt
git-submodule.txt
git-svn.txt	Merge branch 'ja/doc-cleanup'	2021-12-10 14:35:03 -08:00
git-switch.txt	update documentation for new zdiff3 conflictStyle	2021-12-01 14:45:59 -08:00
git-symbolic-ref.txt
git-tag.txt
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	var: add GIT_DEFAULT_BRANCH variable	2021-11-03 13:25:36 -07:00
git-verify-commit.txt
git-verify-pack.txt
git-verify-tag.txt
git-version.txt
git-web--browse.txt	doc: split placeholders as individual tokens	2021-10-28 09:57:09 -07:00
git-whatchanged.txt
git-worktree.txt
git-write-tree.txt
git.txt	Merge branch 'if/redact-packfile-uri'	2021-12-10 14:35:04 -08:00
gitattributes.txt
gitcli.txt
gitcore-tutorial.txt
gitcredentials.txt	doc: uniformize <URL> placeholders' case	2021-11-09 09:39:11 -08:00
gitcvs-migration.txt
gitdiffcore.txt
giteveryday.txt
gitfaq.txt
gitglossary.txt
githooks.txt
gitignore.txt	gitignore.txt: change "folder" to "directory"	2021-10-25 11:06:56 -07:00
gitk.txt
gitmailmap.txt
gitmodules.txt
gitnamespaces.txt
gitremote-helpers.txt
gitrepository-layout.txt
gitrevisions.txt
gitsubmodules.txt	doc: uniformize <URL> placeholders' case	2021-11-09 09:39:11 -08:00
gittutorial-2.txt
gittutorial.txt
gitweb.conf.txt
gitweb.txt	gitweb.txt: change "folder" to "directory"	2021-10-25 11:06:57 -07:00
gitworkflows.txt	doc: uniformize <URL> placeholders' case	2021-11-09 09:39:11 -08:00
glossary-content.txt
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
line-range-format.txt
line-range-options.txt
lint-gitlink.perl
lint-man-end-blurb.perl
lint-man-section-order.perl
Makefile	Merge branch 'ab/fix-make-lint-docs'	2021-10-29 15:43:13 -07:00
manpage-base-url.xsl.in
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage.xsl
merge-options.txt	Document positive variant of commit and merge option "--no-verify"	2021-10-29 11:22:56 -07:00
merge-strategies.txt
MyFirstContribution.txt	Merge branch 'jc/tutorial-format-patch-base'	2021-11-29 15:41:46 -08:00
MyFirstObjectWalk.txt	docs: add headers in MyFirstObjectWalk	2021-10-29 13:02:51 -07:00
object-format-disclaimer.txt
pretty-formats.txt	doc: use only hyphens as word separators in placeholders	2021-11-09 09:39:11 -08:00
pretty-options.txt	log: document --encoding behavior on iconv() failure	2021-10-29 14:35:59 -07:00
pull-fetch-param.txt
ref-reachability-filters.txt
rev-list-description.txt
rev-list-options.txt	Merge branch 'jk/strbuf-addftime-seconds-since-epoch'	2021-12-10 14:35:07 -08:00
revisions.txt
sequencer.txt
signoff-option.txt
SubmittingPatches	SubmittingPatches: fix Asciidoc syntax in "GitHub CI" section	2021-11-13 23:41:54 -08:00
texi.xsl
trace2-target-values.txt
transfer-data-leaks.txt
urls-remotes.txt	doc: uniformize <URL> placeholders' case	2021-11-09 09:39:11 -08:00
urls.txt
user-manual.conf
user-manual.txt