summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore32
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml47
-rw-r--r--Documentation/CodingGuidelines18
-rw-r--r--Documentation/Makefile7
-rw-r--r--Documentation/RelNotes/2.8.0.txt439
-rw-r--r--Documentation/RelNotes/2.8.1.txt9
-rw-r--r--Documentation/RelNotes/2.8.2.txt70
-rw-r--r--Documentation/RelNotes/2.8.3.txt101
-rw-r--r--Documentation/RelNotes/2.8.4.txt69
-rw-r--r--Documentation/RelNotes/2.9.0.txt512
-rw-r--r--Documentation/RelNotes/2.9.1.txt117
-rw-r--r--Documentation/SubmittingPatches80
-rw-r--r--Documentation/blame-options.txt7
-rw-r--r--Documentation/config.txt308
-rw-r--r--Documentation/date-formats.txt2
-rw-r--r--Documentation/diff-config.txt17
-rw-r--r--Documentation/diff-generate-patch.txt2
-rw-r--r--Documentation/diff-options.txt15
-rw-r--r--Documentation/everyday.txto2
-rw-r--r--Documentation/fetch-options.txt17
-rw-r--r--Documentation/git-apply.txt4
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/git-bisect.txt2
-rw-r--r--Documentation/git-blame.txt3
-rw-r--r--Documentation/git-bundle.txt2
-rw-r--r--Documentation/git-check-ignore.txt2
-rw-r--r--Documentation/git-cherry-pick.txt2
-rw-r--r--Documentation/git-clone.txt17
-rw-r--r--Documentation/git-commit-tree.txt4
-rw-r--r--Documentation/git-commit.txt9
-rw-r--r--Documentation/git-config.txt41
-rw-r--r--Documentation/git-credential-cache.txt2
-rw-r--r--Documentation/git-daemon.txt2
-rw-r--r--Documentation/git-fetch-pack.txt4
-rw-r--r--Documentation/git-filter-branch.txt4
-rw-r--r--Documentation/git-for-each-ref.txt24
-rw-r--r--Documentation/git-format-patch.txt70
-rw-r--r--Documentation/git-gc.txt16
-rw-r--r--Documentation/git-grep.txt15
-rw-r--r--Documentation/git-help.txt26
-rw-r--r--Documentation/git-http-backend.txt8
-rw-r--r--Documentation/git-init.txt9
-rw-r--r--Documentation/git-instaweb.txt4
-rw-r--r--Documentation/git-interpret-trailers.txt24
-rw-r--r--Documentation/git-log.txt12
-rw-r--r--Documentation/git-ls-files.txt22
-rw-r--r--Documentation/git-ls-remote.txt18
-rw-r--r--Documentation/git-mailinfo.txt2
-rw-r--r--Documentation/git-merge.txt1
-rw-r--r--Documentation/git-notes.txt22
-rw-r--r--Documentation/git-p4.txt25
-rw-r--r--Documentation/git-pack-objects.txt3
-rw-r--r--Documentation/git-pull.txt13
-rw-r--r--Documentation/git-push.txt15
-rw-r--r--Documentation/git-quiltimport.txt4
-rw-r--r--Documentation/git-rebase.txt8
-rw-r--r--Documentation/git-repack.txt10
-rw-r--r--Documentation/git-replace.txt2
-rw-r--r--Documentation/git-send-email.txt75
-rw-r--r--Documentation/git-sh-setup.txt2
-rw-r--r--Documentation/git-submodule.txt26
-rw-r--r--Documentation/git-svn.txt28
-rw-r--r--Documentation/git-tag.txt4
-rw-r--r--Documentation/git-update-index.txt67
-rw-r--r--Documentation/git-verify-commit.txt2
-rw-r--r--Documentation/git-web--browse.txt6
-rw-r--r--Documentation/git-worktree.txt8
-rw-r--r--Documentation/git.txt147
-rw-r--r--Documentation/gitcore-tutorial.txt18
-rw-r--r--Documentation/gitcredentials.txt5
-rw-r--r--Documentation/githooks.txt73
-rw-r--r--Documentation/gitignore.txt2
-rw-r--r--Documentation/gitremote-helpers.txt6
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/gitweb.conf.txt2
-rw-r--r--Documentation/gitweb.txt4
-rw-r--r--Documentation/glossary-content.txt2
-rwxr-xr-xDocumentation/lint-gitlink.perl71
-rw-r--r--Documentation/merge-config.txt2
-rw-r--r--Documentation/merge-options.txt15
-rw-r--r--Documentation/merge-strategies.txt12
-rw-r--r--Documentation/pretty-formats.txt4
-rw-r--r--Documentation/pretty-options.txt26
-rw-r--r--Documentation/revisions.txt31
-rw-r--r--Documentation/technical/api-config.txt7
-rw-r--r--Documentation/technical/api-credentials.txt4
-rw-r--r--Documentation/technical/api-parse-options.txt15
-rw-r--r--Documentation/technical/api-remote.txt4
-rw-r--r--Documentation/technical/api-trace.txt45
-rw-r--r--Documentation/technical/pack-protocol.txt2
-rw-r--r--Documentation/technical/signature-format.txt186
-rw-r--r--Documentation/urls.txt6
-rw-r--r--Documentation/user-manual.txt2
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile89
-rw-r--r--README.md (renamed from README)63
l---------RelNotes2
-rw-r--r--abspath.c5
-rw-r--r--attr.c2
-rw-r--r--bisect.c16
-rw-r--r--branch.c37
-rw-r--r--branch.h9
-rw-r--r--builtin/add.c33
-rw-r--r--builtin/am.c48
-rw-r--r--builtin/apply.c52
-rw-r--r--builtin/blame.c41
-rw-r--r--builtin/branch.c84
-rw-r--r--builtin/cat-file.c23
-rw-r--r--builtin/check-attr.c22
-rw-r--r--builtin/check-ignore.c20
-rw-r--r--builtin/check-mailmap.c2
-rw-r--r--builtin/checkout-index.c95
-rw-r--r--builtin/checkout.c10
-rw-r--r--builtin/clean.c6
-rw-r--r--builtin/clone.c50
-rw-r--r--builtin/column.c2
-rw-r--r--builtin/commit-tree.c4
-rw-r--r--builtin/commit.c32
-rw-r--r--builtin/config.c38
-rw-r--r--builtin/diff-files.c1
-rw-r--r--builtin/diff-index.c1
-rw-r--r--builtin/diff-tree.c2
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/fetch-pack.c18
-rw-r--r--builtin/fetch.c27
-rw-r--r--builtin/fsck.c3
-rw-r--r--builtin/grep.c72
-rw-r--r--builtin/hash-object.c13