Junio C Hamano b27a79d16b Merge branch 'kb/full-history-compute-treesame-carefully-2' ... Major update to the revision traversal logic to improve culling of irrelevant parents while traversing a mergy history. * kb/full-history-compute-treesame-carefully-2: revision.c: make default history consider bottom commits revision.c: don't show all merges for --parents revision.c: discount side branches when computing TREESAME revision.c: add BOTTOM flag for commits simplify-merges: drop merge from irrelevant side branch simplify-merges: never remove all TREESAME parents t6012: update test for tweaked full-history traversal revision.c: Make --full-history consider more merges Documentation: avoid "uninteresting" rev-list-options.txt: correct TREESAME for P t6111: add parents to tests t6111: allow checking the parents as well t6111: new TREESAME test set t6019: test file dropped in -s ours merge decorate.c: compact table when growing		2013-06-14 08:45:59 -07:00
..
howto	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
RelNotes	Update draft release notes	2013-06-11 13:50:12 -07:00
technical	Merge branch 'jc/prune-all'	2013-05-29 14:23:04 -07:00
.gitattributes
.gitignore
asciidoc.conf
blame-options.txt	log -L: :pattern:file syntax to find by funcname	2013-03-28 10:30:04 -07:00
build-docdep.perl
cat-texi.perl	Documentation: Strip texinfo anchors to avoid duplicates	2013-04-03 16:14:19 -07:00
cmd-list.perl
CodingGuidelines	CodingGuidelines: Documentation/*.txt are the sources	2013-05-10 12:13:08 -07:00
config.txt	rebase: implement --[no-]autostash and rebase.autostash	2013-05-29 10:34:54 -07:00
date-formats.txt
diff-config.txt	Merge branch 'mp/diff-algo-config'	2013-02-17 15:25:52 -08:00
diff-format.txt
diff-generate-patch.txt
diff-options.txt	Merge branch 'rr/diffcore-pickaxe-doc'	2013-06-11 13:31:04 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt
fetch-options.txt	Merge branch 'rr/maint-fetch-tag-doc-asterisks'	2013-06-11 13:31:41 -07:00
fix-texi.perl
git-add.txt	git add: --ignore-removal is a better named --no-all	2013-04-22 13:34:31 -07:00
git-am.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-annotate.txt
git-apply.txt
git-archimport.txt
git-archive.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-bisect-lk2009.txt
git-bisect.txt	Merge branch 'mg/bisect-doc'	2013-02-14 10:29:01 -08:00
git-blame.txt	log -L: :pattern:file syntax to find by funcname	2013-03-28 10:30:04 -07:00
git-branch.txt	Merge branch 'nd/branch-error-cases'	2013-02-07 14:41:38 -08:00
git-bundle.txt
git-cat-file.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-check-attr.txt	Documentation: add caveats about I/O buffering for check-{attr,ignore}	2013-04-11 11:11:36 -07:00
git-check-ignore.txt	Documentation: add caveats about I/O buffering for check-{attr,ignore}	2013-04-11 11:11:36 -07:00
git-check-ref-format.txt	Merge branch 'fc/at-head'	2013-06-11 13:31:23 -07:00
git-checkout-index.txt
git-checkout.txt	Merge branch 'jh/checkout-auto-tracking'	2013-05-29 14:23:10 -07:00
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-column.txt
git-commit-tree.txt	commit-tree: document -S option consistently	2013-03-25 15:01:22 -07:00
git-commit.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-config.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-count-objects.txt	count-objects: add -H option to humanize sizes	2013-04-10 13:27:26 -07:00
git-credential-cache--daemon.txt
git-credential-cache.txt
git-credential-store.txt
git-credential.txt	doc: various spelling fixes	2013-04-12 12:00:52 -07:00
git-cvsexportcommit.txt
git-cvsimport.txt	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
git-cvsserver.txt	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
git-daemon.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-describe.txt	describe: Add --first-parent option	2013-05-20 11:09:03 -07:00
git-diff-files.txt
git-diff-index.txt	Documentation/diff-index: mention two modes of operation	2013-05-20 15:50:44 -07:00
git-diff-tree.txt
git-diff.txt
git-difftool.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-fast-export.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-fast-import.txt
git-fetch-pack.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-fetch.txt
git-filter-branch.txt	Merge branch 'maint-1.8.1' into maint	2013-03-25 13:46:42 -07:00
git-fmt-merge-msg.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-for-each-ref.txt
git-format-patch.txt	format-patch: add format.coverLetter configuration variable	2013-04-07 13:37:47 -07:00
git-fsck-objects.txt
git-fsck.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-gc.txt	git-gc.txt, git-reflog.txt: document new expiry options	2013-04-18 09:30:15 -07:00
git-get-tar-commit-id.txt
git-grep.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-gui.txt
git-hash-object.txt
git-help.txt	doc: include --guide option description for "git help"	2013-04-03 07:43:29 -07:00
git-http-backend.txt	doc/http-backend: match query-string in apache half-auth example	2013-04-13 22:27:06 -07:00
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	clone: open a shortcut for connectivity check	2013-05-28 08:07:20 -07:00
git-init-db.txt
git-init.txt
git-instaweb.txt
git-log.txt	Merge branch 'tr/line-log'	2013-06-02 16:00:44 -07:00
git-lost-found.txt
git-ls-files.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-mailsplit.txt
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-mergetool--lib.txt
git-mergetool.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-notes.txt
git-p4.txt	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
git-pack-objects.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt	Merge branch 'maint-1.8.1' into maint	2013-03-27 10:51:10 -07:00
git-push.txt	Merge branch 'tr/push-no-verify-doc'	2013-06-05 14:56:48 -07:00
git-quiltimport.txt
git-read-tree.txt
git-rebase.txt	rebase: implement --[no-]autostash and rebase.autostash	2013-05-29 10:34:54 -07:00
git-receive-pack.txt
git-reflog.txt	Merge branch 'jc/prune-all'	2013-05-29 14:23:04 -07:00
git-relink.txt
git-remote-ext.txt	doc: various spelling fixes	2013-04-12 12:00:52 -07:00
git-remote-fd.txt
git-remote-helpers.txto
git-remote-testgit.txt	Merge branch 'jk/remote-helpers-doc'	2013-02-07 14:41:45 -08:00
git-remote.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-repack.txt
git-replace.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-repo-config.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt
git-rev-list.txt
git-rev-parse.txt	Merge branch 'ta/glossary'	2013-04-21 18:40:15 -07:00
git-revert.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-rm.txt	Merge branch 'jl/submodule-deinit'	2013-03-25 14:00:29 -07:00
git-send-email.txt	send-email: make annotate configurable	2013-04-07 00:42:29 -07:00
git-send-pack.txt
git-sh-i18n--envsubst.txt
git-sh-i18n.txt
git-sh-setup.txt	mergetools/p4merge: create a base if none available	2013-03-13 10:46:07 -07:00
git-shell.txt	shell: new no-interactive-login command to print a custom message	2013-03-09 23:21:35 -08:00
git-shortlog.txt	git-shortlog.txt: make SYNOPSIS match log, update OPTIONS	2013-04-21 23:11:02 -07:00
git-show-branch.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-show-index.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-show-ref.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-show.txt
git-stage.txt
git-stash.txt
git-status.txt	Merge branch 'tb/document-status-u-tradeoff' into maint	2013-04-01 09:19:30 -07:00
git-stripspace.txt	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
git-submodule.txt	git-submodule.txt: Clarify 'init' and 'add' subcommands.	2013-05-16 12:01:31 -07:00
git-svn.txt	git-svn: introduce --parents parameter for commands branch and tag	2013-05-20 22:05:54 +00:00
git-symbolic-ref.txt
git-tag.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-tar-tree.txt
git-tools.txt	doc: various spelling fixes	2013-04-12 12:00:52 -07:00
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt	documentation: trivial style cleanups	2013-05-17 12:09:21 -07:00
git-update-ref.txt
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-pack.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-verify-tag.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
git-web--browse.txt
git-whatchanged.txt
git-write-tree.txt
git.txt	Merge branch 'cr/git-work-tree-sans-git-dir'	2013-06-11 13:31:01 -07:00
gitattributes.txt
gitcli.txt	Merge branch 'gp/avoid-explicit-mention-of-dot-git-refs' into maint	2013-03-26 12:40:04 -07:00
gitcore-tutorial.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
gitcredentials.txt
gitcvs-migration.txt
gitdiffcore.txt	diffcore-pickaxe doc: document -S and -G properly	2013-06-03 10:53:11 -07:00
gitglossary.txt
githooks.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
gitignore.txt	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
gitk.txt
gitmodules.txt
gitnamespaces.txt
gitremote-helpers.txt	Merge branch 'fc/transport-helper-error-reporting'	2013-05-29 14:20:16 -07:00
gitrepository-layout.txt	Document .git/modules	2013-06-09 13:45:32 -07:00
gitrevisions.txt
gittutorial-2.txt	The name of the hash function is "SHA-1", not "SHA1"	2013-04-15 11:08:37 -07:00
gittutorial.txt
gitweb.conf.txt	gitweb/INSTALL: GITWEB_CONFIG_SYSTEM is for backward compatibility	2013-04-17 15:18:12 -07:00
gitweb.txt
gitworkflows.txt
glossary-content.txt	Merge branch 'jh/checkout-auto-tracking'	2013-05-29 14:23:10 -07:00
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
line-range-format.txt	log -L: :pattern:file syntax to find by funcname	2013-03-28 10:30:04 -07:00
mailmap.txt
Makefile	Merge branch 'da/mergetool-docs'	2013-02-07 14:42:16 -08:00
manpage-1.72.xsl
manpage-base-url.xsl.in
manpage-base.xsl
manpage-bold-literal.xsl
manpage-normal.xsl
manpage-quote-apos.xsl
manpage-suppress-sp.xsl
merge-config.txt	Merge branch 'da/mergetool-docs'	2013-02-07 14:42:16 -08:00
merge-options.txt	Merge branch 'rh/merge-options-doc-fix'	2013-06-02 15:48:22 -07:00
merge-strategies.txt	git-merge(1): document diff-algorithm option to merge-recursive	2013-04-05 10:57:23 -07:00
pretty-formats.txt	Merge branch 'nd/pretty-formats'	2013-04-23 11:22:48 -07:00
pretty-options.txt
pull-fetch-param.txt	fetch: opportunistically update tracking refs	2013-05-12 15:23:48 -07:00
rev-list-options.txt	simplify-merges: drop merge from irrelevant side branch	2013-05-16 11:51:09 -07:00
revisions.txt	Add new @ shortcut for HEAD	2013-05-08 12:13:12 -07:00
sequencer.txt
SubmittingPatches
urls-remotes.txt
urls.txt	Merge branch 'nd/urls-doc-no-file-hyperlink-fix'	2013-06-05 14:56:51 -07:00
user-manual.conf
user-manual.txt	Merge branch 'da/downcase-u-in-usage' into maint	2013-04-01 09:19:04 -07:00