summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--Documentation/Makefile14
-rw-r--r--Documentation/RelNotes-1.6.1.1.txt59
-rw-r--r--Documentation/RelNotes-1.6.1.2.txt39
-rw-r--r--Documentation/RelNotes-1.6.1.3.txt32
-rw-r--r--Documentation/RelNotes-1.6.1.4.txt19
-rw-r--r--Documentation/RelNotes-1.6.1.txt286
-rw-r--r--Documentation/SubmittingPatches2
-rw-r--r--Documentation/asciidoc.conf3
-rw-r--r--Documentation/blame-options.txt14
-rw-r--r--Documentation/config.txt150
-rw-r--r--Documentation/diff-options.txt27
-rw-r--r--Documentation/git-add.txt25
-rw-r--r--Documentation/git-apply.txt14
-rw-r--r--Documentation/git-bisect.txt21
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-check-attr.txt9
-rw-r--r--Documentation/git-checkout.txt59
-rw-r--r--Documentation/git-clone.txt5
-rw-r--r--Documentation/git-commit.txt13
-rw-r--r--Documentation/git-count-objects.txt5
-rw-r--r--Documentation/git-daemon.txt22
-rw-r--r--Documentation/git-describe.txt9
-rw-r--r--Documentation/git-diff-tree.txt19
-rw-r--r--Documentation/git-diff.txt1
-rw-r--r--Documentation/git-fast-export.txt2
-rw-r--r--Documentation/git-filter-branch.txt4
-rw-r--r--Documentation/git-for-each-ref.txt1
-rw-r--r--Documentation/git-format-patch.txt29
-rw-r--r--Documentation/git-grep.txt6
-rw-r--r--Documentation/git-gui.txt19
-rw-r--r--Documentation/git-hash-object.txt20
-rw-r--r--Documentation/git-help.txt4
-rw-r--r--Documentation/git-imap-send.txt78
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-ls-tree.txt8
-rw-r--r--Documentation/git-merge-base.txt76
-rw-r--r--Documentation/git-merge-file.txt12
-rw-r--r--Documentation/git-merge-index.txt6
-rw-r--r--Documentation/git-merge-tree.txt6
-rw-r--r--Documentation/git-merge.txt111
-rw-r--r--Documentation/git-mergetool.txt4
-rw-r--r--Documentation/git-prune.txt5
-rw-r--r--Documentation/git-push.txt63
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rebase.txt146
-rw-r--r--Documentation/git-remote.txt10
-rw-r--r--Documentation/git-reset.txt8
-rw-r--r--Documentation/git-revert.txt8
-rw-r--r--Documentation/git-send-email.txt280
-rw-r--r--Documentation/git-shell.txt5
-rw-r--r--Documentation/git-shortlog.txt40
-rw-r--r--Documentation/git-show-branch.txt2
-rw-r--r--Documentation/git-stage.txt19
-rw-r--r--Documentation/git-submodule.txt26
-rw-r--r--Documentation/git-svn.txt24
-rw-r--r--Documentation/git-tag.txt4
-rw-r--r--Documentation/git-web--browse.txt1
-rw-r--r--Documentation/git.txt22
-rw-r--r--Documentation/gitattributes.txt91
-rw-r--r--Documentation/gitcore-tutorial.txt12
-rw-r--r--Documentation/githooks.txt4
-rw-r--r--Documentation/gitk.txt5
-rw-r--r--Documentation/gitrepository-layout.txt3
-rw-r--r--Documentation/gittutorial-2.txt16
-rw-r--r--Documentation/gittutorial.txt14
-rw-r--r--Documentation/gitworkflows.txt364
-rw-r--r--Documentation/glossary-content.txt3
-rw-r--r--Documentation/howto/rebase-and-edit.txt79
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt179
-rw-r--r--Documentation/i18n.txt6
-rw-r--r--Documentation/merge-config.txt18
-rw-r--r--Documentation/merge-options.txt10
-rw-r--r--Documentation/pretty-formats.txt7
-rw-r--r--Documentation/pull-fetch-param.txt9
-rw-r--r--Documentation/rev-list-options.txt113
-rw-r--r--Documentation/technical/api-run-command.txt2
-rw-r--r--Documentation/technical/api-strbuf.txt7
-rw-r--r--Documentation/technical/racy-git.txt2
-rw-r--r--Documentation/urls.txt8
-rw-r--r--Documentation/user-manual.txt22
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL22
-rw-r--r--Makefile101
l---------RelNotes2
-rw-r--r--abspath.c15
-rw-r--r--archive-tar.c6
-rw-r--r--archive.c8
-rw-r--r--arm/sha1.c16
-rw-r--r--arm/sha1.h15
-rw-r--r--arm/sha1_arm.S4
-rw-r--r--branch.c1
-rw-r--r--builtin-add.c144
-rw-r--r--builtin-apply.c89
-rw-r--r--builtin-blame.c255
-rw-r--r--builtin-branch.c69
-rw-r--r--builtin-cat-file.c3
-rw-r--r--builtin-check-attr.c109
-rw-r--r--builtin-checkout-index.c156
-rw-r--r--builtin-checkout.c246
-rw-r--r--builtin-clean.c6
-rw-r--r--builtin-clone.c129
-rw-r--r--builtin-commit-tree.c14
-rw-r--r--builtin-commit.c159
-rw-r--r--builtin-count-objects.c9
-rw-r--r--builtin-describe.c8
-rw-r--r--builtin-diff-files.c4
-rw-r--r--builtin-diff-tree.c57
-rw-r--r--builtin-diff.c18
-rw-r--r--builtin-fast-export.c3
-rw-r--r--builtin-fetch--tool.c3
-rw-r--r--builtin-fetch-pack.c4
-rw-r--r--builtin-fetch.c23
-rw-r--r--builtin-fmt-merge-msg.c53
-rw-r--r--builtin-for-each-ref.c137
-rw-r--r--builtin-fsck.c8
-rw-r--r--builtin-gc.c17
-rw-r--r--builtin-grep.c23
-rw-r--r--builtin-help.c463
-rw-r--r--builtin-http-fetch.c2
-rw-r--r--builtin-log.c100
-rw-r--r--builtin-ls-tree.c7
-rw-r--r--builtin-merge-base.c43
-rw-r--r--builtin-merge-file.c76
-rw-r--r--builtin-merge-recursive.c1387
-rw-r--r--builtin-merge.c223
-rw-r--r--builtin-pack-objects.c100
-rw-r--r--builtin-prune.c10
-rw-r--r--builtin-push.c13
-rw-r--r--builtin-receive-pack.c (renamed from receive-pack.c)122