Gecko [ sachasauda.akalacademy.ac.in ]

Name	Size	Permission
RelNotes	[ DIR ]	drwxr-xr-x
contrib	[ DIR ]	drwxr-xr-x
howto	[ DIR ]	drwxr-xr-x
technical	[ DIR ]	drwxr-xr-x
COPYING	18.33 KB	-rw-r--r--
README	2.56 KB	-rw-r--r--
blame-options.txt	3.95 KB	-rw-r--r--
cmds-ancillaryinterrogators.tx...	1.18 KB	-rw-r--r--
cmds-ancillarymanipulators.txt	1005 B	-rw-r--r--
cmds-foreignscminterface.txt	760 B	-rw-r--r--
cmds-mainporcelain.txt	2.5 KB	-rw-r--r--
cmds-plumbinginterrogators.txt	1.34 KB	-rw-r--r--
cmds-plumbingmanipulators.txt	1.21 KB	-rw-r--r--
cmds-purehelpers.txt	1.11 KB	-rw-r--r--
cmds-synchelpers.txt	543 B	-rw-r--r--
cmds-synchingrepositories.txt	397 B	-rw-r--r--
config.txt	90.14 KB	-rw-r--r--
date-formats.txt	848 B	-rw-r--r--
diff-config.txt	6.87 KB	-rw-r--r--
diff-format.txt	5.44 KB	-rw-r--r--
diff-generate-patch.txt	6.44 KB	-rw-r--r--
diff-options.txt	18.12 KB	-rw-r--r--
docbook-xsl.css	4.45 KB	-rw-r--r--
everyday.html	35.06 KB	-rw-r--r--
everyday.txt	12.71 KB	-rw-r--r--
fetch-options.txt	4.22 KB	-rw-r--r--
git-add.html	35.63 KB	-rw-r--r--
git-add.txt	13.96 KB	-rw-r--r--
git-am.html	25.86 KB	-rw-r--r--
git-am.txt	6.02 KB	-rw-r--r--
git-annotate.html	23.32 KB	-rw-r--r--
git-annotate.txt	752 B	-rw-r--r--
git-apply.html	30.82 KB	-rw-r--r--
git-apply.txt	10.07 KB	-rw-r--r--
git-archive.html	25.88 KB	-rw-r--r--
git-archive.txt	6.05 KB	-rw-r--r--
git-bisect-lk2009.html	78.86 KB	-rw-r--r--
git-bisect-lk2009.txt	48.08 KB	-rw-r--r--
git-bisect.html	33.08 KB	-rw-r--r--
git-bisect.txt	12.38 KB	-rw-r--r--
git-blame.html	37.08 KB	-rw-r--r--
git-blame.txt	7.63 KB	-rw-r--r--
git-branch.html	31.29 KB	-rw-r--r--
git-branch.txt	9.87 KB	-rw-r--r--
git-bundle.html	25.72 KB	-rw-r--r--
git-bundle.txt	6.89 KB	-rw-r--r--
git-cat-file.html	21.04 KB	-rw-r--r--
git-cat-file.txt	2.9 KB	-rw-r--r--
git-check-attr.html	21.17 KB	-rw-r--r--
git-check-attr.txt	2.72 KB	-rw-r--r--
git-check-ignore.html	20.25 KB	-rw-r--r--
git-check-ignore.txt	2.35 KB	-rw-r--r--
git-check-ref-format.html	22.43 KB	-rw-r--r--
git-check-ref-format.txt	4.08 KB	-rw-r--r--
git-checkout-index.html	24.34 KB	-rw-r--r--
git-checkout-index.txt	5.31 KB	-rw-r--r--
git-checkout.html	38.47 KB	-rw-r--r--
git-checkout.txt	15.61 KB	-rw-r--r--
git-cherry-pick.html	28.28 KB	-rw-r--r--
git-cherry-pick.txt	7.73 KB	-rw-r--r--
git-cherry.html	19.15 KB	-rw-r--r--
git-cherry.txt	1.71 KB	-rw-r--r--
git-citool.html	17.13 KB	-rw-r--r--
git-citool.txt	543 B	-rw-r--r--
git-clean.html	19.45 KB	-rw-r--r--
git-clean.txt	1.92 KB	-rw-r--r--
git-clone.html	34.75 KB	-rw-r--r--
git-clone.txt	9.84 KB	-rw-r--r--
git-column.html	18.47 KB	-rw-r--r--
git-column.txt	1.14 KB	-rw-r--r--
git-commit-tree.html	25.04 KB	-rw-r--r--
git-commit-tree.txt	2.79 KB	-rw-r--r--
git-commit.html	43.18 KB	-rw-r--r--
git-commit.txt	14.96 KB	-rw-r--r--
git-config.html	181.42 KB	-rw-r--r--
git-config.txt	11.52 KB	-rw-r--r--
git-count-objects.html	18.11 KB	-rw-r--r--
git-count-objects.txt	1.06 KB	-rw-r--r--
git-credential-cache--daemon.h...	17.4 KB	-rw-r--r--
git-credential-cache--daemon.t...	684 B	-rw-r--r--
git-credential-cache.html	19.26 KB	-rw-r--r--
git-credential-cache.txt	2.13 KB	-rw-r--r--
git-credential-store.html	19.42 KB	-rw-r--r--
git-credential-store.txt	2.11 KB	-rw-r--r--
git-credential.html	23.82 KB	-rw-r--r--
git-credential.txt	5.72 KB	-rw-r--r--
git-cvsexportcommit.html	21.34 KB	-rw-r--r--
git-cvsexportcommit.txt	3.13 KB	-rw-r--r--
git-cvsimport.html	27.62 KB	-rw-r--r--
git-cvsimport.txt	7.57 KB	-rw-r--r--
git-cvsserver.html	38.1 KB	-rw-r--r--
git-cvsserver.txt	15.21 KB	-rw-r--r--
git-daemon.html	32.69 KB	-rw-r--r--
git-daemon.txt	11.58 KB	-rw-r--r--
git-describe.html	24.35 KB	-rw-r--r--
git-describe.txt	5.59 KB	-rw-r--r--
git-diff-files.html	59.9 KB	-rw-r--r--
git-diff-files.txt	1.18 KB	-rw-r--r--
git-diff-index.html	64.69 KB	-rw-r--r--
git-diff-index.txt	4.49 KB	-rw-r--r--
git-diff-tree.html	82.31 KB	-rw-r--r--
git-diff-tree.txt	5.26 KB	-rw-r--r--
git-diff.html	66.63 KB	-rw-r--r--
git-diff.txt	5.34 KB	-rw-r--r--
git-difftool.html	22.93 KB	-rw-r--r--
git-difftool.txt	4.02 KB	-rw-r--r--
git-fast-export.html	23.45 KB	-rw-r--r--
git-fast-export.txt	5.16 KB	-rw-r--r--
git-fast-import.html	92.66 KB	-rw-r--r--
git-fast-import.txt	53.75 KB	-rw-r--r--
git-fetch-pack.html	21.26 KB	-rw-r--r--
git-fetch-pack.txt	3.28 KB	-rw-r--r--
git-fetch.html	38.95 KB	-rw-r--r--
git-fetch.txt	2.65 KB	-rw-r--r--
git-filter-branch.html	37.67 KB	-rw-r--r--
git-filter-branch.txt	16.84 KB	-rw-r--r--
git-fmt-merge-msg.html	19.55 KB	-rw-r--r--
git-fmt-merge-msg.txt	1.87 KB	-rw-r--r--
git-for-each-ref.html	25.45 KB	-rw-r--r--
git-for-each-ref.txt	5.72 KB	-rw-r--r--
git-format-patch.html	58.91 KB	-rw-r--r--
git-format-patch.txt	18.38 KB	-rw-r--r--
git-fsck-objects.html	16.88 KB	-rw-r--r--
git-fsck-objects.txt	354 B	-rw-r--r--
git-fsck.html	23.33 KB	-rw-r--r--
git-fsck.txt	4.54 KB	-rw-r--r--
git-gc.html	23.82 KB	-rw-r--r--
git-gc.txt	5.34 KB	-rw-r--r--
git-get-tar-commit-id.html	17.32 KB	-rw-r--r--
git-get-tar-commit-id.txt	737 B	-rw-r--r--
git-grep.html	29.02 KB	-rw-r--r--
git-grep.txt	7.55 KB	-rw-r--r--
git-gui.html	22.1 KB	-rw-r--r--
git-gui.txt	3.5 KB	-rw-r--r--
git-hash-object.html	18.92 KB	-rw-r--r--
git-hash-object.txt	1.8 KB	-rw-r--r--
git-help.html	25.14 KB	-rw-r--r--
git-help.txt	5.99 KB	-rw-r--r--
git-http-backend.html	28.46 KB	-rw-r--r--
git-http-backend.txt	9.48 KB	-rw-r--r--
git-http-fetch.html	18.41 KB	-rw-r--r--
git-http-fetch.txt	1.14 KB	-rw-r--r--
git-http-push.html	20.73 KB	-rw-r--r--
git-http-push.txt	2.91 KB	-rw-r--r--
git-imap-send.html	22.84 KB	-rw-r--r--
git-imap-send.txt	4.24 KB	-rw-r--r--
git-index-pack.html	21.01 KB	-rw-r--r--
git-index-pack.txt	3.32 KB	-rw-r--r--
git-init-db.html	16.95 KB	-rw-r--r--
git-init-db.txt	409 B	-rw-r--r--
git-init.html	23 KB	-rw-r--r--
git-init.txt	4.69 KB	-rw-r--r--
git-instaweb.html	20.06 KB	-rw-r--r--
git-instaweb.txt	2.25 KB	-rw-r--r--
git-log.html	111.87 KB	-rw-r--r--
git-log.txt	5.68 KB	-rw-r--r--
git-lost-found.html	18.83 KB	-rw-r--r--
git-lost-found.txt	1.69 KB	-rw-r--r--
git-ls-files.html	26.46 KB	-rw-r--r--
git-ls-files.txt	6.1 KB	-rw-r--r--
git-ls-remote.html	20.11 KB	-rw-r--r--
git-ls-remote.txt	2.54 KB	-rw-r--r--
git-ls-tree.html	21.06 KB	-rw-r--r--
git-ls-tree.txt	2.93 KB	-rw-r--r--
git-mailinfo.html	20.78 KB	-rw-r--r--
git-mailinfo.txt	3 KB	-rw-r--r--
git-mailsplit.html	18.52 KB	-rw-r--r--
git-mailsplit.txt	1.21 KB	-rw-r--r--
git-merge-base.html	23.17 KB	-rw-r--r--
git-merge-base.txt	4.32 KB	-rw-r--r--
git-merge-file.html	20.71 KB	-rw-r--r--
git-merge-file.txt	2.72 KB	-rw-r--r--
git-merge-index.html	19.88 KB	-rw-r--r--
git-merge-index.txt	2.39 KB	-rw-r--r--
git-merge-one-file.html	16.9 KB	-rw-r--r--
git-merge-one-file.txt	387 B	-rw-r--r--
git-merge-tree.html	17.32 KB	-rw-r--r--
git-merge-tree.txt	749 B	-rw-r--r--
git-merge.html	50.38 KB	-rw-r--r--
git-merge.txt	11.97 KB	-rw-r--r--
git-mergetool--lib.html	18.23 KB	-rw-r--r--
git-mergetool--lib.txt	1.18 KB	-rw-r--r--
git-mergetool.html	20.98 KB	-rw-r--r--
git-mergetool.txt	3.26 KB	-rw-r--r--
git-mktag.html	17.63 KB	-rw-r--r--
git-mktag.txt	806 B	-rw-r--r--
git-mktree.html	17.94 KB	-rw-r--r--
git-mktree.txt	1.05 KB	-rw-r--r--
git-mv.html	18.33 KB	-rw-r--r--
git-mv.txt	1.16 KB	-rw-r--r--
git-name-rev.html	19.17 KB	-rw-r--r--
git-name-rev.txt	1.68 KB	-rw-r--r--
git-notes.html	35.71 KB	-rw-r--r--
git-notes.txt	13.08 KB	-rw-r--r--
git-p4.html	44.35 KB	-rw-r--r--
git-p4.txt	18.73 KB	-rw-r--r--
git-pack-objects.html	28.46 KB	-rw-r--r--
git-pack-objects.txt	8.86 KB	-rw-r--r--
git-pack-redundant.html	18.24 KB	-rw-r--r--
git-pack-redundant.txt	1.13 KB	-rw-r--r--
git-pack-refs.html	19.15 KB	-rw-r--r--
git-pack-refs.txt	2.06 KB	-rw-r--r--
git-parse-remote.html	16.97 KB	-rw-r--r--
git-parse-remote.txt	471 B	-rw-r--r--
git-patch-id.html	17.71 KB	-rw-r--r--
git-patch-id.txt	940 B	-rw-r--r--
git-peek-remote.html	18.03 KB	-rw-r--r--
git-peek-remote.txt	1.08 KB	-rw-r--r--
git-prune-packed.html	17.99 KB	-rw-r--r--
git-prune-packed.txt	935 B	-rw-r--r--
git-prune.html	19.57 KB	-rw-r--r--
git-prune.txt	1.76 KB	-rw-r--r--
git-pull.html	54.96 KB	-rw-r--r--
git-pull.txt	7.72 KB	-rw-r--r--
git-push.html	48.49 KB	-rw-r--r--
git-push.txt	16.26 KB	-rw-r--r--
git-quiltimport.html	18.4 KB	-rw-r--r--
git-quiltimport.txt	1.4 KB	-rw-r--r--
git-read-tree.html	38.05 KB	-rw-r--r--
git-read-tree.txt	16.36 KB	-rw-r--r--
git-rebase.html	57.88 KB	-rw-r--r--
git-rebase.txt	23.62 KB	-rw-r--r--
git-receive-pack.html	23.98 KB	-rw-r--r--
git-receive-pack.txt	5.48 KB	-rw-r--r--
git-reflog.html	20.86 KB	-rw-r--r--
git-reflog.txt	3.09 KB	-rw-r--r--
git-relink.html	17.41 KB	-rw-r--r--
git-relink.txt	649 B	-rw-r--r--
git-remote-ext.html	22.43 KB	-rw-r--r--
git-remote-ext.txt	3.93 KB	-rw-r--r--
git-remote-fd.html	19 KB	-rw-r--r--
git-remote-fd.txt	1.63 KB	-rw-r--r--
git-remote-helpers.html	16.45 KB	-rw-r--r--
git-remote-testgit.html	17.26 KB	-rw-r--r--
git-remote-testgit.txt	570 B	-rw-r--r--
git-remote.html	26.62 KB	-rw-r--r--
git-remote.txt	6.79 KB	-rw-r--r--
git-repack.html	22.99 KB	-rw-r--r--
git-repack.txt	4.52 KB	-rw-r--r--
git-replace.html	19.86 KB	-rw-r--r--
git-replace.txt	2.26 KB	-rw-r--r--
git-repo-config.html	16.85 KB	-rw-r--r--
git-repo-config.txt	324 B	-rw-r--r--
git-request-pull.html	17.41 KB	-rw-r--r--
git-request-pull.txt	528 B	-rw-r--r--
git-rerere.html	25.93 KB	-rw-r--r--
git-rerere.txt	7.29 KB	-rw-r--r--
git-reset.html	36.54 KB	-rw-r--r--
git-reset.txt	14.15 KB	-rw-r--r--
git-rev-list.html	73.64 KB	-rw-r--r--
git-rev-list.txt	3.59 KB	-rw-r--r--
git-rev-parse.html	46.91 KB	-rw-r--r--
git-rev-parse.txt	10.03 KB	-rw-r--r--
git-revert.html	22.61 KB	-rw-r--r--
git-revert.txt	3.69 KB	-rw-r--r--
git-rm.html	24.83 KB	-rw-r--r--
git-rm.txt	5.68 KB	-rw-r--r--
git-send-email.html	36.99 KB	-rw-r--r--
git-send-email.txt	13.93 KB	-rw-r--r--
git-send-pack.html	21.8 KB	-rw-r--r--
git-send-pack.txt	3.6 KB	-rw-r--r--
git-sh-i18n--envsubst.html	17.64 KB	-rw-r--r--
git-sh-i18n--envsubst.txt	928 B	-rw-r--r--
git-sh-i18n.html	18.06 KB	-rw-r--r--
git-sh-i18n.txt	1.12 KB	-rw-r--r--
git-sh-setup.html	20.46 KB	-rw-r--r--
git-sh-setup.txt	2.73 KB	-rw-r--r--
git-shell.html	20.25 KB	-rw-r--r--
git-shell.txt	2.47 KB	-rw-r--r--
git-shortlog.html	24.29 KB	-rw-r--r--
git-shortlog.txt	2.57 KB	-rw-r--r--
git-show-branch.html	25.52 KB	-rw-r--r--
git-show-branch.txt	6.36 KB	-rw-r--r--
git-show-index.html	17.03 KB	-rw-r--r--
git-show-index.txt	478 B	-rw-r--r--
git-show-ref.html	24.15 KB	-rw-r--r--
git-show-ref.txt	5.83 KB	-rw-r--r--
git-show.html	38.73 KB	-rw-r--r--
git-show.txt	1.64 KB	-rw-r--r--
git-stage.html	16.82 KB	-rw-r--r--
git-stage.txt	300 B	-rw-r--r--
git-stash.html	29.25 KB	-rw-r--r--
git-stash.txt	9.85 KB	-rw-r--r--
git-status.html	27.38 KB	-rw-r--r--
git-status.txt	7.77 KB	-rw-r--r--
git-stripspace.html	19.37 KB	-rw-r--r--
git-stripspace.txt	1.83 KB	-rw-r--r--
git-submodule.html	36.33 KB	-rw-r--r--
git-submodule.txt	15.13 KB	-rw-r--r--
git-svn.html	73.85 KB	-rw-r--r--
git-svn.txt	41.53 KB	-rw-r--r--
git-symbolic-ref.html	19.37 KB	-rw-r--r--
git-symbolic-ref.txt	1.93 KB	-rw-r--r--
git-tag.html	31.51 KB	-rw-r--r--
git-tag.txt	9.44 KB	-rw-r--r--
git-tar-tree.html	20.04 KB	-rw-r--r--
git-tar-tree.txt	2.31 KB	-rw-r--r--
git-tools.html	22.01 KB	-rw-r--r--
git-tools.txt	3.36 KB	-rw-r--r--
git-unpack-file.html	17.13 KB	-rw-r--r--
git-unpack-file.txt	434 B	-rw-r--r--
git-unpack-objects.html	18.15 KB	-rw-r--r--
git-unpack-objects.txt	1.14 KB	-rw-r--r--
git-update-index.html	35.2 KB	-rw-r--r--
git-update-index.txt	13.2 KB	-rw-r--r--
git-update-ref.html	20.82 KB	-rw-r--r--
git-update-ref.txt	3.16 KB	-rw-r--r--
git-update-server-info.html	17.72 KB	-rw-r--r--
git-update-server-info.txt	797 B	-rw-r--r--
git-upload-archive.html	17.35 KB	-rw-r--r--
git-upload-archive.txt	617 B	-rw-r--r--
git-upload-pack.html	17.88 KB	-rw-r--r--
git-upload-pack.txt	869 B	-rw-r--r--
git-var.html	19.08 KB	-rw-r--r--
git-var.txt	1.8 KB	-rw-r--r--
git-verify-pack.html	18.39 KB	-rw-r--r--
git-verify-pack.txt	1.07 KB	-rw-r--r--
git-verify-tag.html	17.2 KB	-rw-r--r--
git-verify-tag.txt	411 B	-rw-r--r--
git-web--browse.html	21.63 KB	-rw-r--r--
git-web--browse.txt	3.43 KB	-rw-r--r--
git-whatchanged.html	35.64 KB	-rw-r--r--
git-whatchanged.txt	1.55 KB	-rw-r--r--
git-write-tree.html	17.91 KB	-rw-r--r--
git-write-tree.txt	1 KB	-rw-r--r--
git.html	70.05 KB	-rw-r--r--
git.txt	31.8 KB	-rw-r--r--
gitattributes.html	62.01 KB	-rw-r--r--
gitattributes.txt	33.51 KB	-rw-r--r--
gitcli.html	26.56 KB	-rw-r--r--
gitcli.txt	7.75 KB	-rw-r--r--
gitcore-tutorial.html	99.92 KB	-rw-r--r--
gitcore-tutorial.txt	62.33 KB	-rw-r--r--
gitcredentials.html	24.45 KB	-rw-r--r--
gitcredentials.txt	5.93 KB	-rw-r--r--
gitcvs-migration.html	26.03 KB	-rw-r--r--
gitcvs-migration.txt	7.38 KB	-rw-r--r--
gitdiffcore.html	29.51 KB	-rw-r--r--
gitdiffcore.txt	10.78 KB	-rw-r--r--
gitglossary.html	48.63 KB	-rw-r--r--
gitglossary.txt	369 B	-rw-r--r--
githooks.html	35.01 KB	-rw-r--r--
githooks.txt	13.48 KB	-rw-r--r--
gitignore.html	24.81 KB	-rw-r--r--
gitignore.txt	6.58 KB	-rw-r--r--
gitk.html	21.61 KB	-rw-r--r--
gitk.txt	3.23 KB	-rw-r--r--
gitmodules.html	21.72 KB	-rw-r--r--
gitmodules.txt	3.76 KB	-rw-r--r--
gitnamespaces.html	20.5 KB	-rw-r--r--
gitnamespaces.txt	3.2 KB	-rw-r--r--
gitremote-helpers.html	39.11 KB	-rw-r--r--
gitremote-helpers.txt	16.06 KB	-rw-r--r--
gitrepository-layout.html	28.1 KB	-rw-r--r--
gitrepository-layout.txt	7.95 KB	-rw-r--r--
gitrevisions.html	32.66 KB	-rw-r--r--
gitrevisions.txt	774 B	-rw-r--r--
gittutorial-2.html	33.55 KB	-rw-r--r--
gittutorial-2.txt	14.37 KB	-rw-r--r--
gittutorial.html	44.41 KB	-rw-r--r--
gittutorial.txt	22.43 KB	-rw-r--r--
gitweb.conf.html	66.11 KB	-rw-r--r--
gitweb.conf.txt	37.3 KB	-rw-r--r--
gitweb.html	50.94 KB	-rw-r--r--
gitweb.txt	26.34 KB	-rw-r--r--
gitworkflows.html	38.85 KB	-rw-r--r--
gitworkflows.txt	17 KB	-rw-r--r--
glossary-content.txt	21.95 KB	-rw-r--r--
howto-index.html	21.31 KB	-rw-r--r--
howto-index.txt	3.29 KB	-rw-r--r--
i18n.txt	2.16 KB	-rw-r--r--
mailmap.txt	2.35 KB	-rw-r--r--
merge-config.txt	3.47 KB	-rw-r--r--
merge-options.txt	3.58 KB	-rw-r--r--
merge-strategies.txt	4.6 KB	-rw-r--r--
mergetools-diff.txt	181 B	-rw-r--r--
mergetools-merge.txt	187 B	-rw-r--r--
pretty-formats.txt	7.59 KB	-rw-r--r--
pretty-options.txt	2.81 KB	-rw-r--r--
pull-fetch-param.txt	3.19 KB	-rw-r--r--
rev-list-options.txt	27.11 KB	-rw-r--r--
revisions.txt	11.5 KB	-rw-r--r--
sequencer.txt	392 B	-rw-r--r--
urls-remotes.txt	2.4 KB	-rw-r--r--
urls.txt	3.12 KB	-rw-r--r--
user-manual.html	264.08 KB	-rw-r--r--
user-manual.txt	170.67 KB	-rw-r--r--

Code Editor : git-difftool.html

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
<meta name="generator" content="AsciiDoc 8.6.8" />
<title>git-difftool(1)</title>
<style type="text/css">
/* Shared CSS for AsciiDoc xhtml11 and html5 backends */

/* Default font. */
body {
  font-family: Georgia,serif;
}

/* Title font. */
h1, h2, h3, h4, h5, h6,
div.title, caption.title,
thead, p.table.header,
#toctitle,
#author, #revnumber, #revdate, #revremark,
#footer {
  font-family: Arial,Helvetica,sans-serif;
}

body {
  margin: 1em 5% 1em 5%;
}

a {
  color: blue;
  text-decoration: underline;
}
a:visited {
  color: fuchsia;
}

em {
  font-style: italic;
  color: navy;
}

strong {
  font-weight: bold;
  color: #083194;
}

h1, h2, h3, h4, h5, h6 {
  color: #527bbd;
  margin-top: 1.2em;
  margin-bottom: 0.5em;
  line-height: 1.3;
}

h1, h2, h3 {
  border-bottom: 2px solid silver;
}
h2 {
  padding-top: 0.5em;
}
h3 {
  float: left;
}
h3 + * {
  clear: left;
}
h5 {
  font-size: 1.0em;
}

div.sectionbody {
  margin-left: 0;
}

hr {
  border: 1px solid silver;
}

p {
  margin-top: 0.5em;
  margin-bottom: 0.5em;
}

ul, ol, li > p {
  margin-top: 0;
}
ul > li     { color: #aaa; }
ul > li > * { color: black; }

.monospaced, code, pre {
  font-family: "Courier New", Courier, monospace;
  font-size: inherit;
  color: navy;
  padding: 0;
  margin: 0;
}

#author {
  color: #527bbd;
  font-weight: bold;
  font-size: 1.1em;
}
#email {
}
#revnumber, #revdate, #revremark {
}

#footer {
  font-size: small;
  border-top: 2px solid silver;
  padding-top: 0.5em;
  margin-top: 4.0em;
}
#footer-text {
  float: left;
  padding-bottom: 0.5em;
}
#footer-badges {
  float: right;
  padding-bottom: 0.5em;
}

#preamble {
  margin-top: 1.5em;
  margin-bottom: 1.5em;
}
div.imageblock, div.exampleblock, div.verseblock,
div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
div.admonitionblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
div.admonitionblock {
  margin-top: 2.0em;
  margin-bottom: 2.0em;
  margin-right: 10%;
  color: #606060;
}

div.content { /* Block element content. */
  padding: 0;
}

/* Block element titles. */
div.title, caption.title {
  color: #527bbd;
  font-weight: bold;
  text-align: left;
  margin-top: 1.0em;
  margin-bottom: 0.5em;
}
div.title + * {
  margin-top: 0;
}

td div.title:first-child {
  margin-top: 0.0em;
}
div.content div.title:first-child {
  margin-top: 0.0em;
}
div.content + div.title {
  margin-top: 0.0em;
}

div.sidebarblock > div.content {
  background: #ffffee;
  border: 1px solid #dddddd;
  border-left: 4px solid #f0f0f0;
  padding: 0.5em;
}

div.listingblock > div.content {
  border: 1px solid #dddddd;
  border-left: 5px solid #f0f0f0;
  background: #f8f8f8;
  padding: 0.5em;
}

div.quoteblock, div.verseblock {
  padding-left: 1.0em;
  margin-left: 1.0em;
  margin-right: 10%;
  border-left: 5px solid #f0f0f0;
  color: #888;
}

div.quoteblock > div.attribution {
  padding-top: 0.5em;
  text-align: right;
}

div.verseblock > pre.content {
  font-family: inherit;
  font-size: inherit;
}
div.verseblock > div.attribution {
  padding-top: 0.75em;
  text-align: left;
}
/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
div.verseblock + div.attribution {
  text-align: left;
}

div.admonitionblock .icon {
  vertical-align: top;
  font-size: 1.1em;
  font-weight: bold;
  text-decoration: underline;
  color: #527bbd;
  padding-right: 0.5em;
}
div.admonitionblock td.content {
  padding-left: 0.5em;
  border-left: 3px solid #dddddd;
}

div.exampleblock > div.content {
  border-left: 3px solid #dddddd;
  padding-left: 0.5em;
}

div.imageblock div.content { padding-left: 0; }
span.image img { border-style: none; }
a.image:visited { color: white; }

dl {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
}
dt {
  margin-top: 0.5em;
  margin-bottom: 0;
  font-style: normal;
  color: navy;
}
dd > *:first-child {
  margin-top: 0.1em;
}

ul, ol {
    list-style-position: outside;
}
ol.arabic {
  list-style-type: decimal;
}
ol.loweralpha {
  list-style-type: lower-alpha;
}
ol.upperalpha {
  list-style-type: upper-alpha;
}
ol.lowerroman {
  list-style-type: lower-roman;
}
ol.upperroman {
  list-style-type: upper-roman;
}

div.compact ul, div.compact ol,
div.compact p, div.compact p,
div.compact div, div.compact div {
  margin-top: 0.1em;
  margin-bottom: 0.1em;
}

tfoot {
  font-weight: bold;
}
td > div.verse {
  white-space: pre;
}

div.hdlist {
  margin-top: 0.8em;
  margin-bottom: 0.8em;
}
div.hdlist tr {
  padding-bottom: 15px;
}
dt.hdlist1.strong, td.hdlist1.strong {
  font-weight: bold;
}
td.hdlist1 {
  vertical-align: top;
  font-style: normal;
  padding-right: 0.8em;
  color: navy;
}
td.hdlist2 {
  vertical-align: top;
}
div.hdlist.compact tr {
  margin: 0;
  padding-bottom: 0;
}

.comment {
  background: yellow;
}

.footnote, .footnoteref {
  font-size: 0.8em;
}

span.footnote, span.footnoteref {
  vertical-align: super;
}

#footnotes {
  margin: 20px 0 20px 0;
  padding: 7px 0 0 0;
}

#footnotes div.footnote {
  margin: 0 0 5px 0;
}

#footnotes hr {
  border: none;
  border-top: 1px solid silver;
  height: 1px;
  text-align: left;
  margin-left: 0;
  width: 20%;
  min-width: 100px;
}

div.colist td {
  padding-right: 0.5em;
  padding-bottom: 0.3em;
  vertical-align: top;
}
div.colist td img {
  margin-top: 0.3em;
}

@media print {
  #footer-badges { display: none; }
}

#toc {
  margin-bottom: 2.5em;
}

#toctitle {
  color: #527bbd;
  font-size: 1.1em;
  font-weight: bold;
  margin-top: 1.0em;
  margin-bottom: 0.1em;
}

div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
  margin-top: 0;
  margin-bottom: 0;
}
div.toclevel2 {
  margin-left: 2em;
  font-size: 0.9em;
}
div.toclevel3 {
  margin-left: 4em;
  font-size: 0.9em;
}
div.toclevel4 {
  margin-left: 6em;
  font-size: 0.9em;
}

span.aqua { color: aqua; }
span.black { color: black; }
span.blue { color: blue; }
span.fuchsia { color: fuchsia; }
span.gray { color: gray; }
span.green { color: green; }
span.lime { color: lime; }
span.maroon { color: maroon; }
span.navy { color: navy; }
span.olive { color: olive; }
span.purple { color: purple; }
span.red { color: red; }
span.silver { color: silver; }
span.teal { color: teal; }
span.white { color: white; }
span.yellow { color: yellow; }

span.aqua-background { background: aqua; }
span.black-background { background: black; }
span.blue-background { background: blue; }
span.fuchsia-background { background: fuchsia; }
span.gray-background { background: gray; }
span.green-background { background: green; }
span.lime-background { background: lime; }
span.maroon-background { background: maroon; }
span.navy-background { background: navy; }
span.olive-background { background: olive; }
span.purple-background { background: purple; }
span.red-background { background: red; }
span.silver-background { background: silver; }
span.teal-background { background: teal; }
span.white-background { background: white; }
span.yellow-background { background: yellow; }

span.big { font-size: 2em; }
span.small { font-size: 0.6em; }

span.underline { text-decoration: underline; }
span.overline { text-decoration: overline; }
span.line-through { text-decoration: line-through; }

div.unbreakable { page-break-inside: avoid; }

/*
 * xhtml11 specific
 *
 * */

div.tableblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
div.tableblock > table {
  border: 3px solid #527bbd;
}
thead, p.table.header {
  font-weight: bold;
  color: #527bbd;
}
p.table {
  margin-top: 0;
}
/* Because the table frame attribute is overriden by CSS in most browsers. */
div.tableblock > table[frame="void"] {
  border-style: none;
}
div.tableblock > table[frame="hsides"] {
  border-left-style: none;
  border-right-style: none;
}
div.tableblock > table[frame="vsides"] {
  border-top-style: none;
  border-bottom-style: none;
}

/*
 * html5 specific
 *
 * */

table.tableblock {
  margin-top: 1.0em;
  margin-bottom: 1.5em;
}
thead, p.tableblock.header {
  font-weight: bold;
  color: #527bbd;
}
p.tableblock {
  margin-top: 0;
}
table.tableblock {
  border-width: 3px;
  border-spacing: 0px;
  border-style: solid;
  border-color: #527bbd;
  border-collapse: collapse;
}
th.tableblock, td.tableblock {
  border-width: 1px;
  padding: 4px;
  border-style: solid;
  border-color: #527bbd;
}

table.tableblock.frame-topbot {
  border-left-style: hidden;
  border-right-style: hidden;
}
table.tableblock.frame-sides {
  border-top-style: hidden;
  border-bottom-style: hidden;
}
table.tableblock.frame-none {
  border-style: hidden;
}

th.tableblock.halign-left, td.tableblock.halign-left {
  text-align: left;
}
th.tableblock.halign-center, td.tableblock.halign-center {
  text-align: center;
}
th.tableblock.halign-right, td.tableblock.halign-right {
  text-align: right;
}

th.tableblock.valign-top, td.tableblock.valign-top {
  vertical-align: top;
}
th.tableblock.valign-middle, td.tableblock.valign-middle {
  vertical-align: middle;
}
th.tableblock.valign-bottom, td.tableblock.valign-bottom {
  vertical-align: bottom;
}

/*
 * manpage specific
 *
 * */

body.manpage h1 {
  padding-top: 0.5em;
  padding-bottom: 0.5em;
  border-top: 2px solid silver;
  border-bottom: 2px solid silver;
}
body.manpage h2 {
  border-style: none;
}
body.manpage div.sectionbody {
  margin-left: 3em;
}

@media print {
  body.manpage div#toc { display: none; }
}

</style>
<script type="text/javascript">
/*<![CDATA[*/
var asciidoc = {  // Namespace.

/////////////////////////////////////////////////////////////////////
// Table Of Contents generator
/////////////////////////////////////////////////////////////////////

/* Author: Mihai Bazon, September 2002
 * http://students.infoiasi.ro/~mishoo
 *
 * Table Of Content generator
 * Version: 0.4
 *
 * Feel free to use this script under the terms of the GNU General Public
 * License, as long as you do not remove or alter this notice.
 */

/* modified by Troy D. Hanson, September 2006. License: GPL */
 /* modified by Stuart Rackham, 2006, 2009. License: GPL */

// toclevels = 1..4.
toc: function (toclevels) {

function getText(el) {
    var text = "";
    for (var i = el.firstChild; i != null; i = i.nextSibling) {
      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
        text += i.data;
      else if (i.firstChild != null)
        text += getText(i);
    }
    return text;
  }

function TocEntry(el, text, toclevel) {
    this.element = el;
    this.text = text;
    this.toclevel = toclevel;
  }

var toc = document.getElementById("toc");
  if (!toc) {
    return;
  }

// Delete existing TOC entries in case we're reloading the TOC.
  var tocEntriesToRemove = [];
  var i;
  for (i = 0; i < toc.childNodes.length; i++) {
    var entry = toc.childNodes[i];
    if (entry.nodeName.toLowerCase() == 'div'
     && entry.getAttribute("class")
     && entry.getAttribute("class").match(/^toclevel/))
      tocEntriesToRemove.push(entry);
  }
  for (i = 0; i < tocEntriesToRemove.length; i++) {
    toc.removeChild(tocEntriesToRemove[i]);
  }

// Rebuild TOC entries.
  var entries = tocEntries(document.getElementById("content"), toclevels);
  for (var i = 0; i < entries.length; ++i) {
    var entry = entries[i];
    if (entry.element.id == "")
      entry.element.id = "_toc_" + i;
    var a = document.createElement("a");
    a.href = "#" + entry.element.id;
    a.appendChild(document.createTextNode(entry.text));
    var div = document.createElement("div");
    div.appendChild(a);
    div.className = "toclevel" + entry.toclevel;
    toc.appendChild(div);
  }
  if (entries.length == 0)
    toc.parentNode.removeChild(toc);
},

/////////////////////////////////////////////////////////////////////
// Footnotes generator
/////////////////////////////////////////////////////////////////////

/* Based on footnote generation code from:
 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
 */

footnotes: function () {
  // Delete existing footnote entries in case we're reloading the footnodes.
  var i;
  var noteholder = document.getElementById("footnotes");
  if (!noteholder) {
    return;
  }
  var entriesToRemove = [];
  for (i = 0; i < noteholder.childNodes.length; i++) {
    var entry = noteholder.childNodes[i];
    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
      entriesToRemove.push(entry);
  }
  for (i = 0; i < entriesToRemove.length; i++) {
    noteholder.removeChild(entriesToRemove[i]);
  }

// Rebuild footnote entries.
  var cont = document.getElementById("content");
  var spans = cont.getElementsByTagName("span");
  var refs = {};
  var n = 0;
  for (i=0; i<spans.length; i++) {
    if (spans[i].className == "footnote") {
      n++;
      var note = spans[i].getAttribute("data-note");
      if (!note) {
        // Use [\s\S] in place of . so multi-line matches work.
        // Because JavaScript has no s (dotall) regex flag.
        note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
        spans[i].innerHTML =
          "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
          "' title='View footnote' class='footnote'>" + n + "</a>]";
        spans[i].setAttribute("data-note", note);
      }
      noteholder.innerHTML +=
        "<div class='footnote' id='_footnote_" + n + "'>" +
        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
        n + "</a>. " + note + "</div>";
      var id =spans[i].getAttribute("id");
      if (id != null) refs["#"+id] = n;
    }
  }
  if (n == 0)
    noteholder.parentNode.removeChild(noteholder);
  else {
    // Process footnoterefs.
    for (i=0; i<spans.length; i++) {
      if (spans[i].className == "footnoteref") {
        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
        href = href.match(/#.*/)[0];  // Because IE return full URL.
        n = refs[href];
        spans[i].innerHTML =
          "[<a href='#_footnote_" + n +
          "' title='View footnote' class='footnote'>" + n + "</a>]";
      }
    }
  }
},

install: function(toclevels) {
  var timerId;

function reinstall() {
    asciidoc.footnotes();
    if (toclevels) {
      asciidoc.toc(toclevels);
    }
  }

function reinstallAndRemoveTimer() {
    clearInterval(timerId);
    reinstall();
  }

timerId = setInterval(reinstall, 500);
  if (document.addEventListener)
    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
  else
    window.onload = reinstallAndRemoveTimer;
}

}
asciidoc.install();
/*]]>*/
</script>
</head>
<body class="manpage">
<div id="header">
<h1>
git-difftool(1) Manual Page
</h1>
<h2>NAME</h2>
<div class="sectionbody">
<p>git-difftool -
   Show changes using common diff tools
</p>
</div>
</div>
<div id="content">
<div class="sect1">
<h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
<pre class="content"><em>git difftool</em> [&lt;options&gt;] [&lt;commit&gt; [&lt;commit&gt;]] [--] [&lt;path&gt;&#8230;]</pre>
<div class="attribution">
</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_description">DESCRIPTION</h2>
<div class="sectionbody">
<div class="paragraph"><p><em>git difftool</em> is a Git command that allows you to compare and edit files
between revisions using common diff tools.  <em>git difftool</em> is a frontend
to <em>git diff</em> and accepts the same options and arguments. See
<a href="git-diff.html">git-diff(1)</a>.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_options">OPTIONS</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
-d
</dt>
<dt class="hdlist1">
--dir-diff
</dt>
<dd>
<p>
        Copy the modified files to a temporary location and perform
        a directory diff on them. This mode never prompts before
        launching the diff tool.
</p>
</dd>
<dt class="hdlist1">
-y
</dt>
<dt class="hdlist1">
--no-prompt
</dt>
<dd>
<p>
        Do not prompt before launching a diff tool.
</p>
</dd>
<dt class="hdlist1">
--prompt
</dt>
<dd>
<p>
        Prompt before each invocation of the diff tool.
        This is the default behaviour; the option is provided to
        override any configuration settings.
</p>
</dd>
<dt class="hdlist1">
-t &lt;tool&gt;
</dt>
<dt class="hdlist1">
--tool=&lt;tool&gt;
</dt>
<dd>
<p>
        Use the diff tool specified by &lt;tool&gt;.  Valid values include
        emerge, kompare, meld, and vimdiff. Run <code>git difftool --tool-help</code>
        for the list of valid &lt;tool&gt; settings.
</p>
<div class="paragraph"><p>If a diff tool is not specified, <em>git difftool</em>
will use the configuration variable <code>diff.tool</code>.  If the
configuration variable <code>diff.tool</code> is not set, <em>git difftool</em>
will pick a suitable default.</p></div>
<div class="paragraph"><p>You can explicitly provide a full path to the tool by setting the
configuration variable <code>difftool.&lt;tool&gt;.path</code>. For example, you
can configure the absolute path to kdiff3 by setting
<code>difftool.kdiff3.path</code>. Otherwise, <em>git difftool</em> assumes the
tool is available in PATH.</p></div>
<div class="paragraph"><p>Instead of running one of the known diff tools,
<em>git difftool</em> can be customized to run an alternative program
by specifying the command line to invoke in a configuration
variable <code>difftool.&lt;tool&gt;.cmd</code>.</p></div>
<div class="paragraph"><p>When <em>git difftool</em> is invoked with this tool (either through the
<code>-t</code> or <code>--tool</code> option or the <code>diff.tool</code> configuration variable)
the configured command line will be invoked with the following
variables available: <code>$LOCAL</code> is set to the name of the temporary
file containing the contents of the diff pre-image and <code>$REMOTE</code>
is set to the name of the temporary file containing the contents
of the diff post-image.  <code>$MERGED</code> is the name of the file which is
being compared. <code>$BASE</code> is provided for compatibility
with custom merge tool commands and has the same value as <code>$MERGED</code>.</p></div>
</dd>
<dt class="hdlist1">
--tool-help
</dt>
<dd>
<p>
        Print a list of diff tools that may be used with <code>--tool</code>.
</p>
</dd>
<dt class="hdlist1">
--[no-]symlinks
</dt>
<dd>
<p>
        <em>git difftool</em>'s default behavior is create symlinks to the
        working tree when run in <code>--dir-diff</code> mode and the right-hand
        side of the comparison yields the same content as the file in
        the working tree.
</p>
<div class="paragraph"><p>Specifying <code>--no-symlinks</code> instructs <em>git difftool</em> to create copies
instead.  <code>--no-symlinks</code> is the default on Windows.</p></div>
</dd>
<dt class="hdlist1">
-x &lt;command&gt;
</dt>
<dt class="hdlist1">
--extcmd=&lt;command&gt;
</dt>
<dd>
<p>
        Specify a custom command for viewing diffs.
        <em>git-difftool</em> ignores the configured defaults and runs
        <code>$command $LOCAL $REMOTE</code> when this option is specified.
        Additionally, <code>$BASE</code> is set in the environment.
</p>
</dd>
<dt class="hdlist1">
-g
</dt>
<dt class="hdlist1">
--gui
</dt>
<dd>
<p>
        When <em>git-difftool</em> is invoked with the <code>-g</code> or <code>--gui</code> option
        the default diff tool will be read from the configured
        <code>diff.guitool</code> variable instead of <code>diff.tool</code>.
</p>
</dd>
</dl></div>
<div class="paragraph"><p>See <a href="git-diff.html">git-diff(1)</a> for the full list of supported options.</p></div>
</div>
</div>
<div class="sect1">
<h2 id="_config_variables">CONFIG VARIABLES</h2>
<div class="sectionbody">
<div class="paragraph"><p><em>git difftool</em> falls back to <em>git mergetool</em> config variables when the
difftool equivalents have not been defined.</p></div>
<div class="dlist"><dl>
<dt class="hdlist1">
diff.tool
</dt>
<dd>
<p>
        The default diff tool to use.
</p>
</dd>
<dt class="hdlist1">
diff.guitool
</dt>
<dd>
<p>
        The default diff tool to use when <code>--gui</code> is specified.
</p>
</dd>
<dt class="hdlist1">
difftool.&lt;tool&gt;.path
</dt>
<dd>
<p>
        Override the path for the given tool.  This is useful in case
        your tool is not in the PATH.
</p>
</dd>
<dt class="hdlist1">
difftool.&lt;tool&gt;.cmd
</dt>
<dd>
<p>
        Specify the command to invoke the specified diff tool.
</p>
<div class="paragraph"><p>See the <code>--tool=&lt;tool&gt;</code> option above for more details.</p></div>
</dd>
<dt class="hdlist1">
difftool.prompt
</dt>
<dd>
<p>
        Prompt before each invocation of the diff tool.
</p>
</dd>
</dl></div>
</div>
</div>
<div class="sect1">
<h2 id="_see_also">SEE ALSO</h2>
<div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
<a href="git-diff.html">git-diff(1)</a>
</dt>
<dd>
<p>
         Show changes between commits, commit and working tree, etc
</p>
</dd>
<dt class="hdlist1">
<a href="git-mergetool.html">git-mergetool(1)</a>
</dt>
<dd>
<p>
        Run merge conflict resolution tools to resolve merge conflicts
</p>
</dd>
<dt class="hdlist1">
<a href="git-config.html">git-config(1)</a>
</dt>
<dd>
<p>
         Get and set repository or global options
</p>
</dd>
</dl></div>
</div>
</div>
<div class="sect1">
<h2 id="_git">GIT</h2>
<div class="sectionbody">
<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
</div>
</div>
</div>
<div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
Last updated 2013-06-10 20:01:55 UTC
</div>
</div>
</body>
</html>

${this.title}

Code Editor : git-difftool.html