X7ROOT File Manager
Current Path:
/usr/share/doc/git-1.8.3.1
usr
/
share
/
doc
/
git-1.8.3.1
/
📁
..
📄
COPYING
(18.33 KB)
📄
README
(2.56 KB)
📁
RelNotes
📄
blame-options.txt
(3.95 KB)
📄
cmds-ancillaryinterrogators.txt
(1.18 KB)
📄
cmds-ancillarymanipulators.txt
(1005 B)
📄
cmds-foreignscminterface.txt
(760 B)
📄
cmds-mainporcelain.txt
(2.5 KB)
📄
cmds-plumbinginterrogators.txt
(1.34 KB)
📄
cmds-plumbingmanipulators.txt
(1.21 KB)
📄
cmds-purehelpers.txt
(1.11 KB)
📄
cmds-synchelpers.txt
(543 B)
📄
cmds-synchingrepositories.txt
(397 B)
📄
config.txt
(90.14 KB)
📁
contrib
📄
date-formats.txt
(848 B)
📄
diff-config.txt
(6.87 KB)
📄
diff-format.txt
(5.44 KB)
📄
diff-generate-patch.txt
(6.44 KB)
📄
diff-options.txt
(18.12 KB)
📄
docbook-xsl.css
(4.45 KB)
📄
everyday.html
(35.06 KB)
📄
everyday.txt
(12.71 KB)
📄
fetch-options.txt
(4.22 KB)
📄
git-add.html
(35.63 KB)
📄
git-add.txt
(13.96 KB)
📄
git-am.html
(25.86 KB)
📄
git-am.txt
(6.02 KB)
📄
git-annotate.html
(23.32 KB)
📄
git-annotate.txt
(752 B)
📄
git-apply.html
(30.82 KB)
📄
git-apply.txt
(10.07 KB)
📄
git-archive.html
(25.88 KB)
📄
git-archive.txt
(6.05 KB)
📄
git-bisect-lk2009.html
(78.86 KB)
📄
git-bisect-lk2009.txt
(48.08 KB)
📄
git-bisect.html
(33.08 KB)
📄
git-bisect.txt
(12.38 KB)
📄
git-blame.html
(37.08 KB)
📄
git-blame.txt
(7.63 KB)
📄
git-branch.html
(31.29 KB)
📄
git-branch.txt
(9.87 KB)
📄
git-bundle.html
(25.72 KB)
📄
git-bundle.txt
(6.89 KB)
📄
git-cat-file.html
(21.04 KB)
📄
git-cat-file.txt
(2.9 KB)
📄
git-check-attr.html
(21.17 KB)
📄
git-check-attr.txt
(2.72 KB)
📄
git-check-ignore.html
(20.25 KB)
📄
git-check-ignore.txt
(2.35 KB)
📄
git-check-ref-format.html
(22.43 KB)
📄
git-check-ref-format.txt
(4.08 KB)
📄
git-checkout-index.html
(24.34 KB)
📄
git-checkout-index.txt
(5.31 KB)
📄
git-checkout.html
(38.47 KB)
📄
git-checkout.txt
(15.61 KB)
📄
git-cherry-pick.html
(28.28 KB)
📄
git-cherry-pick.txt
(7.73 KB)
📄
git-cherry.html
(19.15 KB)
📄
git-cherry.txt
(1.71 KB)
📄
git-citool.html
(17.13 KB)
📄
git-citool.txt
(543 B)
📄
git-clean.html
(19.45 KB)
📄
git-clean.txt
(1.92 KB)
📄
git-clone.html
(34.75 KB)
📄
git-clone.txt
(9.84 KB)
📄
git-column.html
(18.47 KB)
📄
git-column.txt
(1.14 KB)
📄
git-commit-tree.html
(25.04 KB)
📄
git-commit-tree.txt
(2.79 KB)
📄
git-commit.html
(43.18 KB)
📄
git-commit.txt
(14.96 KB)
📄
git-config.html
(181.42 KB)
📄
git-config.txt
(11.52 KB)
📄
git-count-objects.html
(18.11 KB)
📄
git-count-objects.txt
(1.06 KB)
📄
git-credential-cache--daemon.html
(17.4 KB)
📄
git-credential-cache--daemon.txt
(684 B)
📄
git-credential-cache.html
(19.26 KB)
📄
git-credential-cache.txt
(2.13 KB)
📄
git-credential-store.html
(19.42 KB)
📄
git-credential-store.txt
(2.11 KB)
📄
git-credential.html
(23.82 KB)
📄
git-credential.txt
(5.72 KB)
📄
git-cvsexportcommit.html
(21.34 KB)
📄
git-cvsexportcommit.txt
(3.13 KB)
📄
git-cvsimport.html
(27.62 KB)
📄
git-cvsimport.txt
(7.57 KB)
📄
git-cvsserver.html
(38.1 KB)
📄
git-cvsserver.txt
(15.21 KB)
📄
git-daemon.html
(32.69 KB)
📄
git-daemon.txt
(11.58 KB)
📄
git-describe.html
(24.35 KB)
📄
git-describe.txt
(5.59 KB)
📄
git-diff-files.html
(59.9 KB)
📄
git-diff-files.txt
(1.18 KB)
📄
git-diff-index.html
(64.69 KB)
📄
git-diff-index.txt
(4.49 KB)
📄
git-diff-tree.html
(82.31 KB)
📄
git-diff-tree.txt
(5.26 KB)
📄
git-diff.html
(66.63 KB)
📄
git-diff.txt
(5.34 KB)
📄
git-difftool.html
(22.93 KB)
📄
git-difftool.txt
(4.02 KB)
📄
git-fast-export.html
(23.45 KB)
📄
git-fast-export.txt
(5.16 KB)
📄
git-fast-import.html
(92.66 KB)
📄
git-fast-import.txt
(53.75 KB)
📄
git-fetch-pack.html
(21.26 KB)
📄
git-fetch-pack.txt
(3.28 KB)
📄
git-fetch.html
(38.95 KB)
📄
git-fetch.txt
(2.65 KB)
📄
git-filter-branch.html
(37.67 KB)
📄
git-filter-branch.txt
(16.84 KB)
📄
git-fmt-merge-msg.html
(19.55 KB)
📄
git-fmt-merge-msg.txt
(1.87 KB)
📄
git-for-each-ref.html
(25.45 KB)
📄
git-for-each-ref.txt
(5.72 KB)
📄
git-format-patch.html
(58.91 KB)
📄
git-format-patch.txt
(18.38 KB)
📄
git-fsck-objects.html
(16.88 KB)
📄
git-fsck-objects.txt
(354 B)
📄
git-fsck.html
(23.33 KB)
📄
git-fsck.txt
(4.54 KB)
📄
git-gc.html
(23.82 KB)
📄
git-gc.txt
(5.34 KB)
📄
git-get-tar-commit-id.html
(17.32 KB)
📄
git-get-tar-commit-id.txt
(737 B)
📄
git-grep.html
(29.02 KB)
📄
git-grep.txt
(7.55 KB)
📄
git-gui.html
(22.1 KB)
📄
git-gui.txt
(3.5 KB)
📄
git-hash-object.html
(18.92 KB)
📄
git-hash-object.txt
(1.8 KB)
📄
git-help.html
(25.14 KB)
📄
git-help.txt
(5.99 KB)
📄
git-http-backend.html
(28.46 KB)
📄
git-http-backend.txt
(9.48 KB)
📄
git-http-fetch.html
(18.41 KB)
📄
git-http-fetch.txt
(1.14 KB)
📄
git-http-push.html
(20.73 KB)
📄
git-http-push.txt
(2.91 KB)
📄
git-imap-send.html
(22.84 KB)
📄
git-imap-send.txt
(4.24 KB)
📄
git-index-pack.html
(21.01 KB)
📄
git-index-pack.txt
(3.32 KB)
📄
git-init-db.html
(16.95 KB)
📄
git-init-db.txt
(409 B)
📄
git-init.html
(23 KB)
📄
git-init.txt
(4.69 KB)
📄
git-instaweb.html
(20.06 KB)
📄
git-instaweb.txt
(2.25 KB)
📄
git-log.html
(111.87 KB)
📄
git-log.txt
(5.68 KB)
📄
git-lost-found.html
(18.83 KB)
📄
git-lost-found.txt
(1.69 KB)
📄
git-ls-files.html
(26.46 KB)
📄
git-ls-files.txt
(6.1 KB)
📄
git-ls-remote.html
(20.11 KB)
📄
git-ls-remote.txt
(2.54 KB)
📄
git-ls-tree.html
(21.06 KB)
📄
git-ls-tree.txt
(2.93 KB)
📄
git-mailinfo.html
(20.78 KB)
📄
git-mailinfo.txt
(3 KB)
📄
git-mailsplit.html
(18.52 KB)
📄
git-mailsplit.txt
(1.21 KB)
📄
git-merge-base.html
(23.17 KB)
📄
git-merge-base.txt
(4.32 KB)
📄
git-merge-file.html
(20.71 KB)
📄
git-merge-file.txt
(2.72 KB)
📄
git-merge-index.html
(19.88 KB)
📄
git-merge-index.txt
(2.39 KB)
📄
git-merge-one-file.html
(16.9 KB)
📄
git-merge-one-file.txt
(387 B)
📄
git-merge-tree.html
(17.32 KB)
📄
git-merge-tree.txt
(749 B)
📄
git-merge.html
(50.38 KB)
📄
git-merge.txt
(11.97 KB)
📄
git-mergetool--lib.html
(18.23 KB)
📄
git-mergetool--lib.txt
(1.18 KB)
📄
git-mergetool.html
(20.98 KB)
📄
git-mergetool.txt
(3.26 KB)
📄
git-mktag.html
(17.63 KB)
📄
git-mktag.txt
(806 B)
📄
git-mktree.html
(17.94 KB)
📄
git-mktree.txt
(1.05 KB)
📄
git-mv.html
(18.33 KB)
📄
git-mv.txt
(1.16 KB)
📄
git-name-rev.html
(19.17 KB)
📄
git-name-rev.txt
(1.68 KB)
📄
git-notes.html
(35.71 KB)
📄
git-notes.txt
(13.08 KB)
📄
git-p4.html
(44.35 KB)
📄
git-p4.txt
(18.73 KB)
📄
git-pack-objects.html
(28.46 KB)
📄
git-pack-objects.txt
(8.86 KB)
📄
git-pack-redundant.html
(18.24 KB)
📄
git-pack-redundant.txt
(1.13 KB)
📄
git-pack-refs.html
(19.15 KB)
📄
git-pack-refs.txt
(2.06 KB)
📄
git-parse-remote.html
(16.97 KB)
📄
git-parse-remote.txt
(471 B)
📄
git-patch-id.html
(17.71 KB)
📄
git-patch-id.txt
(940 B)
📄
git-peek-remote.html
(18.03 KB)
📄
git-peek-remote.txt
(1.08 KB)
📄
git-prune-packed.html
(17.99 KB)
📄
git-prune-packed.txt
(935 B)
📄
git-prune.html
(19.57 KB)
📄
git-prune.txt
(1.76 KB)
📄
git-pull.html
(54.96 KB)
📄
git-pull.txt
(7.72 KB)
📄
git-push.html
(48.49 KB)
📄
git-push.txt
(16.26 KB)
📄
git-quiltimport.html
(18.4 KB)
📄
git-quiltimport.txt
(1.4 KB)
📄
git-read-tree.html
(38.05 KB)
📄
git-read-tree.txt
(16.36 KB)
📄
git-rebase.html
(57.88 KB)
📄
git-rebase.txt
(23.62 KB)
📄
git-receive-pack.html
(23.98 KB)
📄
git-receive-pack.txt
(5.48 KB)
📄
git-reflog.html
(20.86 KB)
📄
git-reflog.txt
(3.09 KB)
📄
git-relink.html
(17.41 KB)
📄
git-relink.txt
(649 B)
📄
git-remote-ext.html
(22.43 KB)
📄
git-remote-ext.txt
(3.93 KB)
📄
git-remote-fd.html
(19 KB)
📄
git-remote-fd.txt
(1.63 KB)
📄
git-remote-helpers.html
(16.45 KB)
📄
git-remote-testgit.html
(17.26 KB)
📄
git-remote-testgit.txt
(570 B)
📄
git-remote.html
(26.62 KB)
📄
git-remote.txt
(6.79 KB)
📄
git-repack.html
(22.99 KB)
📄
git-repack.txt
(4.52 KB)
📄
git-replace.html
(19.86 KB)
📄
git-replace.txt
(2.26 KB)
📄
git-repo-config.html
(16.85 KB)
📄
git-repo-config.txt
(324 B)
📄
git-request-pull.html
(17.41 KB)
📄
git-request-pull.txt
(528 B)
📄
git-rerere.html
(25.93 KB)
📄
git-rerere.txt
(7.29 KB)
📄
git-reset.html
(36.54 KB)
📄
git-reset.txt
(14.15 KB)
📄
git-rev-list.html
(73.64 KB)
📄
git-rev-list.txt
(3.59 KB)
📄
git-rev-parse.html
(46.91 KB)
📄
git-rev-parse.txt
(10.03 KB)
📄
git-revert.html
(22.61 KB)
📄
git-revert.txt
(3.69 KB)
📄
git-rm.html
(24.83 KB)
📄
git-rm.txt
(5.68 KB)
📄
git-send-email.html
(36.99 KB)
📄
git-send-email.txt
(13.93 KB)
📄
git-send-pack.html
(21.8 KB)
📄
git-send-pack.txt
(3.6 KB)
📄
git-sh-i18n--envsubst.html
(17.64 KB)
📄
git-sh-i18n--envsubst.txt
(928 B)
📄
git-sh-i18n.html
(18.06 KB)
📄
git-sh-i18n.txt
(1.12 KB)
📄
git-sh-setup.html
(20.46 KB)
📄
git-sh-setup.txt
(2.73 KB)
📄
git-shell.html
(20.25 KB)
📄
git-shell.txt
(2.47 KB)
📄
git-shortlog.html
(24.29 KB)
📄
git-shortlog.txt
(2.57 KB)
📄
git-show-branch.html
(25.52 KB)
📄
git-show-branch.txt
(6.36 KB)
📄
git-show-index.html
(17.03 KB)
📄
git-show-index.txt
(478 B)
📄
git-show-ref.html
(24.15 KB)
📄
git-show-ref.txt
(5.83 KB)
📄
git-show.html
(38.73 KB)
📄
git-show.txt
(1.64 KB)
📄
git-stage.html
(16.82 KB)
📄
git-stage.txt
(300 B)
📄
git-stash.html
(29.25 KB)
📄
git-stash.txt
(9.85 KB)
📄
git-status.html
(27.38 KB)
📄
git-status.txt
(7.77 KB)
📄
git-stripspace.html
(19.37 KB)
📄
git-stripspace.txt
(1.83 KB)
📄
git-submodule.html
(36.33 KB)
📄
git-submodule.txt
(15.13 KB)
📄
git-svn.html
(73.85 KB)
📄
git-svn.txt
(41.53 KB)
📄
git-symbolic-ref.html
(19.37 KB)
📄
git-symbolic-ref.txt
(1.93 KB)
📄
git-tag.html
(31.51 KB)
📄
git-tag.txt
(9.44 KB)
📄
git-tar-tree.html
(20.04 KB)
📄
git-tar-tree.txt
(2.31 KB)
📄
git-tools.html
(22.01 KB)
📄
git-tools.txt
(3.36 KB)
📄
git-unpack-file.html
(17.13 KB)
📄
git-unpack-file.txt
(434 B)
📄
git-unpack-objects.html
(18.15 KB)
📄
git-unpack-objects.txt
(1.14 KB)
📄
git-update-index.html
(35.2 KB)
📄
git-update-index.txt
(13.2 KB)
📄
git-update-ref.html
(20.82 KB)
📄
git-update-ref.txt
(3.16 KB)
📄
git-update-server-info.html
(17.72 KB)
📄
git-update-server-info.txt
(797 B)
📄
git-upload-archive.html
(17.35 KB)
📄
git-upload-archive.txt
(617 B)
📄
git-upload-pack.html
(17.88 KB)
📄
git-upload-pack.txt
(869 B)
📄
git-var.html
(19.08 KB)
📄
git-var.txt
(1.8 KB)
📄
git-verify-pack.html
(18.39 KB)
📄
git-verify-pack.txt
(1.07 KB)
📄
git-verify-tag.html
(17.2 KB)
📄
git-verify-tag.txt
(411 B)
📄
git-web--browse.html
(21.63 KB)
📄
git-web--browse.txt
(3.43 KB)
📄
git-whatchanged.html
(35.64 KB)
📄
git-whatchanged.txt
(1.55 KB)
📄
git-write-tree.html
(17.91 KB)
📄
git-write-tree.txt
(1 KB)
📄
git.html
(70.05 KB)
📄
git.txt
(31.8 KB)
📄
gitattributes.html
(62.01 KB)
📄
gitattributes.txt
(33.51 KB)
📄
gitcli.html
(26.56 KB)
📄
gitcli.txt
(7.75 KB)
📄
gitcore-tutorial.html
(99.92 KB)
📄
gitcore-tutorial.txt
(62.33 KB)
📄
gitcredentials.html
(24.45 KB)
📄
gitcredentials.txt
(5.93 KB)
📄
gitcvs-migration.html
(26.03 KB)
📄
gitcvs-migration.txt
(7.38 KB)
📄
gitdiffcore.html
(29.51 KB)
📄
gitdiffcore.txt
(10.78 KB)
📄
gitglossary.html
(48.63 KB)
📄
gitglossary.txt
(369 B)
📄
githooks.html
(35.01 KB)
📄
githooks.txt
(13.48 KB)
📄
gitignore.html
(24.81 KB)
📄
gitignore.txt
(6.58 KB)
📄
gitk.html
(21.61 KB)
📄
gitk.txt
(3.23 KB)
📄
gitmodules.html
(21.72 KB)
📄
gitmodules.txt
(3.76 KB)
📄
gitnamespaces.html
(20.5 KB)
📄
gitnamespaces.txt
(3.2 KB)
📄
gitremote-helpers.html
(39.11 KB)
📄
gitremote-helpers.txt
(16.06 KB)
📄
gitrepository-layout.html
(28.1 KB)
📄
gitrepository-layout.txt
(7.95 KB)
📄
gitrevisions.html
(32.66 KB)
📄
gitrevisions.txt
(774 B)
📄
gittutorial-2.html
(33.55 KB)
📄
gittutorial-2.txt
(14.37 KB)
📄
gittutorial.html
(44.41 KB)
📄
gittutorial.txt
(22.43 KB)
📄
gitweb.conf.html
(66.11 KB)
📄
gitweb.conf.txt
(37.3 KB)
📄
gitweb.html
(50.94 KB)
📄
gitweb.txt
(26.34 KB)
📄
gitworkflows.html
(38.85 KB)
📄
gitworkflows.txt
(17 KB)
📄
glossary-content.txt
(21.95 KB)
📁
howto
📄
howto-index.html
(21.31 KB)
📄
howto-index.txt
(3.29 KB)
📄
i18n.txt
(2.16 KB)
📄
mailmap.txt
(2.35 KB)
📄
merge-config.txt
(3.47 KB)
📄
merge-options.txt
(3.58 KB)
📄
merge-strategies.txt
(4.6 KB)
📄
mergetools-diff.txt
(181 B)
📄
mergetools-merge.txt
(187 B)
📄
pretty-formats.txt
(7.59 KB)
📄
pretty-options.txt
(2.81 KB)
📄
pull-fetch-param.txt
(3.19 KB)
📄
rev-list-options.txt
(27.11 KB)
📄
revisions.txt
(11.5 KB)
📄
sequencer.txt
(392 B)
📁
technical
📄
urls-remotes.txt
(2.4 KB)
📄
urls.txt
(3.12 KB)
📄
user-manual.html
(264.08 KB)
📄
user-manual.txt
(170.67 KB)
Editing: git-diff.txt
git-diff(1) =========== NAME ---- git-diff - Show changes between commits, commit and working tree, etc SYNOPSIS -------- [verse] 'git diff' [options] [<commit>] [--] [<path>...] 'git diff' [options] --cached [<commit>] [--] [<path>...] 'git diff' [options] <commit> <commit> [--] [<path>...] 'git diff' [options] <blob> <blob> 'git diff' [options] [--no-index] [--] <path> <path> DESCRIPTION ----------- Show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, or changes between two files on disk. 'git diff' [--options] [--] [<path>...]:: This form is to view the changes you made relative to the index (staging area for the next commit). In other words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. + If exactly two paths are given and at least one points outside the current repository, 'git diff' will compare the two files / directories. This behavior can be forced by --no-index. 'git diff' [--options] --cached [<commit>] [--] [<path>...]:: This form is to view the changes you staged for the next commit relative to the named <commit>. Typically you would want comparison with the latest commit, so if you do not give <commit>, it defaults to HEAD. If HEAD does not exist (e.g. unborned branches) and <commit> is not given, it shows all staged changes. --staged is a synonym of --cached. 'git diff' [--options] <commit> [--] [<path>...]:: This form is to view the changes you have in your working tree relative to the named <commit>. You can use HEAD to compare it with the latest commit, or a branch name to compare with the tip of a different branch. 'git diff' [--options] <commit> <commit> [--] [<path>...]:: This is to view the changes between two arbitrary <commit>. 'git diff' [options] <blob> <blob>:: This form is to view the differences between the raw contents of two blob objects. 'git diff' [--options] <commit>..<commit> [--] [<path>...]:: This is synonymous to the previous form. If <commit> on one side is omitted, it will have the same effect as using HEAD instead. 'git diff' [--options] <commit>\...<commit> [--] [<path>...]:: This form is to view the changes on the branch containing and up to the second <commit>, starting at a common ancestor of both <commit>. "git diff A\...B" is equivalent to "git diff $(git-merge-base A B) B". You can omit any one of <commit>, which has the same effect as using HEAD instead. Just in case if you are doing something exotic, it should be noted that all of the <commit> in the above description, except in the last two forms that use ".." notations, can be any <tree>. For a more complete list of ways to spell <commit>, see "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7]. However, "diff" is about comparing two _endpoints_, not ranges, and the range notations ("<commit>..<commit>" and "<commit>\...<commit>") do not mean a range as defined in the "SPECIFYING RANGES" section in linkgit:gitrevisions[7]. OPTIONS ------- :git-diff: 1 include::diff-options.txt[] <path>...:: The <paths> parameters, when given, are used to limit the diff to the named paths (you can give directory names and get diff for all files under them). include::diff-format.txt[] EXAMPLES -------- Various ways to check your working tree:: + ------------ $ git diff <1> $ git diff --cached <2> $ git diff HEAD <3> ------------ + <1> Changes in the working tree not yet staged for the next commit. <2> Changes between the index and your last commit; what you would be committing if you run "git commit" without "-a" option. <3> Changes in the working tree since your last commit; what you would be committing if you run "git commit -a" Comparing with arbitrary commits:: + ------------ $ git diff test <1> $ git diff HEAD -- ./test <2> $ git diff HEAD^ HEAD <3> ------------ + <1> Instead of using the tip of the current branch, compare with the tip of "test" branch. <2> Instead of comparing with the tip of "test" branch, compare with the tip of the current branch, but limit the comparison to the file "test". <3> Compare the version before the last commit and the last commit. Comparing branches:: + ------------ $ git diff topic master <1> $ git diff topic..master <2> $ git diff topic...master <3> ------------ + <1> Changes between the tips of the topic and the master branches. <2> Same as above. <3> Changes that occurred on the master branch since when the topic branch was started off it. Limiting the diff output:: + ------------ $ git diff --diff-filter=MRC <1> $ git diff --name-status <2> $ git diff arch/i386 include/asm-i386 <3> ------------ + <1> Show only modification, rename and copy, but not addition nor deletion. <2> Show only names and the nature of change, but not actual diff output. <3> Limit diff output to named subtrees. Munging the diff output:: + ------------ $ git diff --find-copies-harder -B -C <1> $ git diff -R <2> ------------ + <1> Spend extra cycles to find renames, copies and complete rewrites (very expensive). <2> Output diff in reverse. SEE ALSO -------- diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1] GIT --- Part of the linkgit:git[1] suite
Upload File
Create Folder