Markus Heidelberg b98c212a9f git-mergetool: add new merge tool TortoiseMerge ... TortoiseMerge comes with TortoiseSVN or TortoiseGit for Windows. It can only be used as a merge tool with an existing base file. It cannot be used without a base nor as a diff tool. The documentation only mentions the slash '/' as command line option prefix, which refused to work, but the parser also accepts the dash '-' See http://code.google.com/p/msysgit/issues/detail?id=226 Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2009-04-07 22:19:55 -07:00
..
howto	Documentation: Typo / spelling / formatting fixes	2009-03-03 21:43:19 -08:00
technical	Merge branch 'maint'	2009-03-30 13:29:57 -07:00
.gitattributes
.gitignore
asciidoc.conf	Documentation: asciidoc.conf: fix verse block with block titles	2009-03-27 00:33:20 -07:00
blame-options.txt	Merge branch 'dm/maint-docco'	2009-03-21 23:24:46 -07:00
build-docdep.perl
cat-texi.perl
cmd-list.perl
CodingGuidelines	lstat_cache(): swap func(length, string) into func(string, length)	2009-02-09 20:59:26 -08:00
config.txt	Documentation: branch.*.merge can also affect 'git-push'	2009-04-06 00:14:55 -07:00
diff-format.txt
diff-generate-patch.txt
diff-options.txt	doc: clarify how -S works	2009-03-19 02:47:40 -07:00
docbook-xsl.css	docbook: change css style	2009-04-06 00:27:09 -07:00
docbook.xsl
everyday.txt	everyday: use the dashless form of git-init	2009-03-22 10:33:36 -07:00
fetch-options.txt
fix-texi.perl
git-add.txt	Merge branch 'jc/maint-add-p-unquote' into maint	2009-03-11 13:55:49 -07:00
git-am.txt	Documentation: minor grammatical fixes.	2009-03-02 12:34:53 -08:00
git-annotate.txt	Documentation: minor grammatical fixes.	2009-03-02 12:34:54 -08:00
git-apply.txt	Documentation: minor grammatical fixes.	2009-03-02 12:34:56 -08:00
git-archimport.txt
git-archive.txt	Merge branch 'dm/maint-docco'	2009-03-21 23:24:46 -07:00
git-bisect.txt	Merge branch 'dm/maint-docco'	2009-03-26 00:26:04 -07:00
git-blame.txt	Documentation: minor grammatical fixes in git-blame.txt.	2009-03-17 12:08:43 -07:00
git-branch.txt	Merge branch 'dm/maint-docco'	2009-03-21 23:24:46 -07:00
git-bundle.txt	Documentation: minor grammatical fixes and rewording in git-bundle.txt	2009-03-22 20:59:20 -07:00
git-cat-file.txt	Documentation: minor grammatical fixes in git-cat-file.txt	2009-03-22 21:02:08 -07:00
git-check-attr.txt	Documentation: minor grammatical fixes in git-check-attr.txt	2009-03-22 21:02:38 -07:00
git-check-ref-format.txt	Merge branch 'jc/name-branch'	2009-04-06 00:43:44 -07:00
git-checkout-index.txt
git-checkout.txt	Documentation: remove extra quoting/emphasis around literal texts	2009-03-17 14:16:44 -07:00
git-cherry-pick.txt
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt	Merge branch 'maint-1.6.0' into maint-1.6.1	2009-04-01 22:35:57 -07:00
git-commit-tree.txt
git-commit.txt
git-config.txt	Merge branch 'fc/parseopt-config'	2009-03-20 14:29:03 -07:00
git-count-objects.txt
git-cvsexportcommit.txt
git-cvsimport.txt	Cleanup warning about known issues in cvsimport documentation	2009-04-01 15:46:46 -07:00
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-fast-export.txt
git-fast-import.txt
git-fetch-pack.txt
git-fetch.txt
git-filter-branch.txt	Documentation: filter-branch: show --ignore-unmatch in main index-filter example	2009-03-11 21:55:07 -07:00
git-fmt-merge-msg.txt
git-for-each-ref.txt
git-format-patch.txt	Add configuration variable for sign-off to format-patch	2009-04-06 00:12:32 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt	gc: make --prune useful again by accepting an optional parameter	2009-02-14 21:14:07 -08:00
git-get-tar-commit-id.txt
git-grep.txt	grep: color patterns in output	2009-03-07 11:34:59 -08:00
git-gui.txt
git-hash-object.txt
git-help.txt
git-http-fetch.txt
git-http-push.txt
git-imap-send.txt	imap.preformattedHTML to tell Thunderbird to send non-flowed text	2009-02-15 00:32:57 -08:00
git-index-pack.txt
git-init-db.txt
git-init.txt
git-instaweb.txt
git-log.txt
git-lost-found.txt
git-ls-files.txt
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
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	Grammar fix for "git merge" man page	2009-03-26 09:38:58 -07:00
git-mergetool.txt	git-mergetool: add new merge tool TortoiseMerge	2009-04-07 22:19:55 -07:00
git-mktag.txt
git-mktree.txt
git-mv.txt
git-name-rev.txt
git-pack-objects.txt
git-pack-redundant.txt
git-pack-refs.txt	doc/git-pack-refs: fix two grammar issues	2009-04-05 00:39:37 -07:00
git-parse-remote.txt
git-patch-id.txt	Grammar fixes to "merge" and "patch-id" docs	2009-03-25 17:28:33 -07:00
git-peek-remote.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt
git-push.txt	git-push.txt: describe how to default to pushing only current branch	2009-03-17 14:15:04 -07:00
git-quiltimport.txt
git-read-tree.txt
git-rebase.txt	rebase: add options passed to git-am	2009-03-18 19:25:01 -07:00
git-receive-pack.txt
git-reflog.txt
git-relink.txt
git-remote.txt	builtin-remote: add set-head subcommand	2009-02-27 15:19:09 -08:00
git-repack.txt
git-repo-config.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt
git-rev-list.txt
git-rev-parse.txt	Documentation: remove extra quoting/emphasis around literal texts	2009-03-17 14:16:44 -07:00
git-revert.txt
git-rm.txt
git-send-email.txt	git-send-email.txt: clarify which options take an argument.	2009-04-07 22:07:58 -07:00
git-send-pack.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt	Move mailmap documentation into separate file	2009-02-08 12:38:08 -08:00
git-show-branch.txt
git-show-index.txt
git-show-ref.txt
git-show.txt
git-stage.txt
git-stash.txt
git-status.txt
git-stripspace.txt
git-submodule.txt
git-svn.txt	Documentation: git-svn: fix trunk/fetch svn-remote key typo	2009-04-01 21:43:03 -07:00
git-symbolic-ref.txt
git-tag.txt	Merge branch 'maint-1.6.1' into maint	2009-03-30 13:25:27 -07:00
git-tar-tree.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
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt
git-whatchanged.txt
git-write-tree.txt
git.txt	Sync with GIT 1.6.2.1	2009-03-15 13:12:53 -07:00
gitattributes.txt	gitattributes.txt: Path matching rules are explained in gitignore.txt	2009-02-25 00:49:54 -08:00
gitcli.txt	Documentation: remove extra quoting/emphasis around literal texts	2009-03-17 14:16:44 -07:00
gitcore-tutorial.txt
gitcvs-migration.txt
gitdiffcore.txt
gitglossary.txt
githooks.txt	githooks documentation: post-checkout hook is also called after clone	2009-03-22 12:29:47 -07:00
gitignore.txt
gitk.txt	Documentation: Expand a couple of abbreviations	2009-03-03 21:42:44 -08:00
gitmodules.txt
gitrepository-layout.txt
gittutorial-2.txt
gittutorial.txt
gitworkflows.txt
glossary-content.txt	Documentation: remove extra quoting/emphasis around literal texts	2009-03-17 14:16:44 -07:00
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
mailmap.txt	Documentation: minor grammatical fixes in git-blame.txt.	2009-03-17 12:08:43 -07:00
Makefile	Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set	2009-04-01 11:02:42 -07:00
manpage-1.72.xsl	Documentation: move quieting params into manpage-base.xsl	2009-03-27 00:33:19 -07:00
manpage-base.xsl	Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set	2009-04-01 11:02:42 -07:00
manpage-bold-literal.xsl	Documentation: option to render literal text as bold for manpages	2009-03-27 00:33:20 -07:00
manpage-normal.xsl	Documentation: move "spurious .sp" code into manpage-base.xsl	2009-03-27 00:33:19 -07:00
manpage-suppress-sp.xsl	Documentation: use "spurious .sp" XSLT if DOCBOOK_SUPPRESS_SP is set	2009-04-01 11:02:42 -07:00
merge-config.txt	git-mergetool: add new merge tool TortoiseMerge	2009-04-07 22:19:55 -07:00
merge-options.txt
merge-strategies.txt	Grammar fixes to "merge" and "patch-id" docs	2009-03-25 17:28:33 -07:00
pretty-formats.txt	pretty.c: add %f format specifier to format_commit_message()	2009-03-22 21:32:13 -07:00
pretty-options.txt	Add --oneline that is a synonym to "--pretty=oneline --abbrev-commit"	2009-02-24 23:53:40 -08:00
pull-fetch-param.txt
RelNotes-1.5.0.1.txt
RelNotes-1.5.0.2.txt
RelNotes-1.5.0.3.txt
RelNotes-1.5.0.4.txt
RelNotes-1.5.0.5.txt
RelNotes-1.5.0.6.txt
RelNotes-1.5.0.7.txt
RelNotes-1.5.0.txt
RelNotes-1.5.1.1.txt
RelNotes-1.5.1.2.txt
RelNotes-1.5.1.3.txt
RelNotes-1.5.1.4.txt
RelNotes-1.5.1.5.txt
RelNotes-1.5.1.6.txt
RelNotes-1.5.1.txt
RelNotes-1.5.2.1.txt
RelNotes-1.5.2.2.txt	Documentation: Typos / spelling fixes in RelNotes	2009-03-03 21:40:36 -08:00
RelNotes-1.5.2.3.txt
RelNotes-1.5.2.4.txt
RelNotes-1.5.2.5.txt
RelNotes-1.5.2.txt
RelNotes-1.5.3.1.txt
RelNotes-1.5.3.2.txt
RelNotes-1.5.3.3.txt
RelNotes-1.5.3.4.txt
RelNotes-1.5.3.5.txt
RelNotes-1.5.3.6.txt
RelNotes-1.5.3.7.txt
RelNotes-1.5.3.8.txt
RelNotes-1.5.3.txt
RelNotes-1.5.4.1.txt
RelNotes-1.5.4.2.txt
RelNotes-1.5.4.3.txt
RelNotes-1.5.4.4.txt
RelNotes-1.5.4.5.txt
RelNotes-1.5.4.6.txt
RelNotes-1.5.4.7.txt
RelNotes-1.5.4.txt
RelNotes-1.5.5.1.txt
RelNotes-1.5.5.2.txt
RelNotes-1.5.5.3.txt
RelNotes-1.5.5.4.txt
RelNotes-1.5.5.5.txt
RelNotes-1.5.5.6.txt
RelNotes-1.5.5.txt
RelNotes-1.5.6.1.txt
RelNotes-1.5.6.2.txt
RelNotes-1.5.6.3.txt
RelNotes-1.5.6.4.txt
RelNotes-1.5.6.5.txt
RelNotes-1.5.6.6.txt
RelNotes-1.5.6.txt
RelNotes-1.6.0.1.txt
RelNotes-1.6.0.2.txt	Documentation: Typos / spelling fixes in RelNotes	2009-03-03 21:40:36 -08:00
RelNotes-1.6.0.3.txt
RelNotes-1.6.0.4.txt
RelNotes-1.6.0.5.txt
RelNotes-1.6.0.6.txt
RelNotes-1.6.0.txt
RelNotes-1.6.1.1.txt	Documentation: Typos / spelling fixes in RelNotes	2009-03-03 21:40:36 -08:00
RelNotes-1.6.1.2.txt	Documentation: Typos / spelling fixes in RelNotes	2009-03-03 21:40:36 -08:00
RelNotes-1.6.1.3.txt
RelNotes-1.6.1.4.txt	Prepare for 1.6.1.4.	2009-02-11 18:44:03 -08:00
RelNotes-1.6.1.txt
RelNotes-1.6.2.1.txt	GIT 1.6.2.1	2009-03-15 13:05:05 -07:00
RelNotes-1.6.2.2.txt	GIT 1.6.2.2	2009-04-02 12:34:16 -07:00
RelNotes-1.6.2.txt	GIT 1.6.2	2009-03-03 23:37:19 -08:00
RelNotes-1.6.3.txt	Update draft release notes to 1.6.3	2009-04-02 13:42:24 -07:00
rev-list-options.txt	git-rev-list.txt: make ascii markup uniform with other pages.	2009-04-07 22:08:13 -07:00
SubmittingPatches	Google has renamed the imap folder	2009-03-04 00:56:52 -08:00
urls-remotes.txt
urls.txt
user-manual.conf
user-manual.txt	user-manual: the name of the hash function is SHA-1, not sha1	2009-04-06 00:37:34 -07:00