Junio C Hamano 18973d8ac9 Merge branch 'jk/difftool-dir-diff-edit-fix' ... "git difftool --dir-diff" made symlinks to working tree files when preparing a temporary directory structure, so that accidental edits of these files in the difftool are reflected back to the working tree, but the logic to decide when to do so was not quite right. * jk/difftool-dir-diff-edit-fix: difftool --dir-diff: symlink all files matching the working tree difftool: avoid double slashes in symlink targets git-difftool(1): fix formatting of --symlink description		2013-03-28 14:37:22 -07:00
..
howto	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
RelNotes	Merge branch 'maint'	2013-03-27 10:58:07 -07:00
technical	Merge branch 'maint-1.8.1' into maint	2013-03-25 13:46:42 -07:00
.gitattributes
.gitignore	doc: generate a list of valid merge tools	2013-02-02 21:46:52 -08:00
asciidoc.conf	Documentation: avoid poor-man's small caps GIT	2013-02-01 13:53:25 -08:00
blame-options.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines	Merge branch 'tz/perl-styles'	2013-02-14 10:28:55 -08:00
config.txt	Merge branch 'maint'	2013-03-28 14:34:55 -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 'maint-1.8.1' into maint	2013-03-25 13:46:42 -07:00
docbook-xsl.css
docbook.xsl
everyday.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
fetch-options.txt	fetch: elaborate --depth action	2013-01-11 09:11:10 -08:00
fix-texi.perl
git-add.txt	add: Clarify documentation of -A and -u	2013-03-07 11:16:54 -08:00
git-am.txt
git-annotate.txt
git-apply.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-archimport.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-archive.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-bisect-lk2009.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-bisect.txt	Merge branch 'mg/bisect-doc'	2013-02-14 10:29:01 -08:00
git-blame.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-branch.txt	Merge branch 'nd/branch-error-cases'	2013-02-07 14:41:38 -08:00
git-bundle.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-cat-file.txt
git-check-attr.txt
git-check-ignore.txt	add git-check-ignore sub-command	2013-01-06 14:26:38 -08:00
git-check-ref-format.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-checkout-index.txt
git-checkout.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-clone.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-column.txt
git-commit-tree.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-commit.txt	Merge branch 'maint'	2013-03-27 10:58:07 -07:00
git-config.txt	Merge branch 'jn/warn-on-inaccessible-loosen' into maint	2013-01-11 16:47:07 -08:00
git-count-objects.txt	count-objects: report how much disk space taken by garbage files	2013-02-15 09:02:34 -08:00
git-credential-cache--daemon.txt
git-credential-cache.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-credential-store.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-credential.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-cvsexportcommit.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
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: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-describe.txt	Merge branch 'maint-1.8.1' into maint	2013-03-25 13:46:42 -07:00
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-difftool.txt	difftool --dir-diff: symlink all files matching the working tree	2013-03-14 14:33:06 -07:00
git-fast-export.txt
git-fast-import.txt	Merge branch 'jk/maint-fast-import-doc-reorder' into maint	2013-01-14 07:59:46 -08:00
git-fetch-pack.txt	fetch: add --unshallow for turning shallow repo into complete one	2013-01-11 09:09:30 -08:00
git-fetch.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
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
git-for-each-ref.txt	git-for-each-ref.txt: 'raw' is a supported date format	2013-01-21 16:26:26 -08:00
git-format-patch.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-fsck-objects.txt
git-fsck.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-gc.txt
git-get-tar-commit-id.txt
git-grep.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-gui.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-hash-object.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-help.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-http-backend.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-http-fetch.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-http-push.txt
git-imap-send.txt
git-index-pack.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-init-db.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-init.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-instaweb.txt
git-log.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-lost-found.txt
git-ls-files.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-ls-remote.txt
git-ls-tree.txt
git-mailinfo.txt
git-mailsplit.txt
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-mergetool--lib.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-mergetool.txt
git-mktag.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-mktree.txt
git-mv.txt	Documentation: avoid poor-man's small caps GIT	2013-02-01 13:53:25 -08:00
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	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt
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 'jc/maint-push-refspec-default-doc' into maint	2013-03-26 12:40:14 -07:00
git-quiltimport.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-read-tree.txt
git-rebase.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-receive-pack.txt
git-reflog.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-relink.txt
git-remote-ext.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-remote-fd.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-remote-helpers.txto	Rename {git- => git}remote-helpers.txt	2013-02-01 14:12:34 -08:00
git-remote-testgit.txt	Merge branch 'jk/remote-helpers-doc'	2013-02-07 14:41:45 -08:00
git-remote.txt
git-repack.txt
git-replace.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-repo-config.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt	reset: update documentation to require only tree-ish with paths	2013-01-16 12:50:23 -08:00
git-rev-list.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-rev-parse.txt	Documentation: do not use undefined terms git-dir and git-file	2013-02-01 13:53:33 -08:00
git-revert.txt
git-rm.txt	Merge branch 'jl/submodule-deinit'	2013-03-25 14:00:29 -07:00
git-send-email.txt	git-send-email: use git credential to obtain password	2013-02-27 09:46:03 -08:00
git-send-pack.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
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	Merge branch 'jk/shortlog-no-wrap-doc' into maint	2013-01-14 07:59:03 -08:00
git-show-branch.txt
git-show-index.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-show-ref.txt
git-show.txt
git-stage.txt
git-stash.txt	Documentation/git-stash.txt: add a missing verb	2012-12-10 08:18:25 -08:00
git-status.txt	Merge branch 'tb/document-status-u-tradeoff'	2013-03-21 14:02:10 -07:00
git-stripspace.txt	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
git-submodule.txt	Merge branch 'jl/submodule-deinit'	2013-03-25 14:00:29 -07:00
git-svn.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-symbolic-ref.txt
git-tag.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-tar-tree.txt
git-tools.txt	Documentation: StGit is the right spelling, not StGIT	2013-02-01 13:54:46 -08:00
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt	Merge branch 'maint-1.8.1' into maint	2013-03-25 13:46:42 -07:00
git-update-ref.txt	Documentation: avoid poor-man's small caps GIT	2013-02-01 13:53:25 -08:00
git-update-server-info.txt
git-upload-archive.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-upload-pack.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-var.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-verify-pack.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-verify-tag.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-web--browse.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-whatchanged.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
git-write-tree.txt
git.txt	Merge branch 'maint-1.8.1' into maint	2013-03-26 13:14:11 -07:00
gitattributes.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
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	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitcredentials.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitcvs-migration.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitdiffcore.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitglossary.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
githooks.txt	Merge branch 'maint-1.8.1' into maint	2013-03-25 13:46:42 -07:00
gitignore.txt	Merge branch 'ta/doc-no-small-caps'	2013-02-05 16:13:32 -08:00
gitk.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitmodules.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitnamespaces.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitremote-helpers.txt	Merge branch 'jk/remote-helpers-doc'	2013-02-07 14:41:45 -08:00
gitrepository-layout.txt	Documentation: describe the "repository" in repository-layout	2013-02-01 13:54:46 -08:00
gitrevisions.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gittutorial-2.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gittutorial.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitweb.conf.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitweb.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
gitworkflows.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
glossary-content.txt	Documentation: add a description for 'gitfile' to glossary	2013-02-01 13:53:33 -08:00
howto-index.sh	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
i18n.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
install-doc-quick.sh
install-webdoc.sh
mailmap.txt	Merge branch 'jk/mailmap-from-blob'	2013-01-05 23:41:42 -08:00
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-strategies.txt
pretty-formats.txt	Merge branch 'mg/gpg-interface-using-status'	2013-03-21 14:02:55 -07:00
pretty-options.txt
pull-fetch-param.txt
rev-list-options.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
revisions.txt	Merge branch 'maint'	2013-03-17 00:11:11 -07:00
sequencer.txt
SubmittingPatches	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
urls-remotes.txt	Documentation: the name of the system is 'Git', not 'git'	2013-02-01 13:53:33 -08:00
urls.txt	Merge branch 'jk/remote-helpers-doc'	2013-02-07 14:41:45 -08:00
user-manual.conf
user-manual.txt	Merge branch 'wk/user-manual-literal-format'	2013-03-19 12:20:44 -07:00