summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
</
-rw-r--r--.clang-format169
-rw-r--r--.gitattributes8
-rw-r--r--.github/CONTRIBUTING.md19
-rw-r--r--.github/PULL_REQUEST_TEMPLATE.md7
-rw-r--r--.gitignore1
-rw-r--r--.gitmodules4
-rw-r--r--.mailmap3
-rw-r--r--.travis.yml128
-rw-r--r--.tsan-suppressions10
-rw-r--r--Documentation/.gitignore1
-rw-r--r--Documentation/CodingGuidelines12
-rw-r--r--Documentation/Makefile13
-rw-r--r--Documentation/RelNotes/1.7.10.1.txt2
-rw-r--r--Documentation/RelNotes/2.12.0.txt2
-rw-r--r--Documentation/RelNotes/2.13.0.txt618
-rw-r--r--Documentation/RelNotes/2.13.1.txt114
-rw-r--r--Documentation/RelNotes/2.13.2.txt54
-rw-r--r--Documentation/RelNotes/2.13.3.txt62
-rw-r--r--Documentation/RelNotes/2.13.4.txt28
-rw-r--r--Documentation/RelNotes/2.13.5.txt4
-rw-r--r--Documentation/RelNotes/2.13.6.txt17
-rw-r--r--Documentation/RelNotes/2.14.0.txt517
-rw-r--r--Documentation/RelNotes/2.14.1.txt4
-rw-r--r--Documentation/RelNotes/2.14.2.txt105
-rw-r--r--Documentation/RelNotes/2.14.3.txt99
-rw-r--r--Documentation/RelNotes/2.15.0.txt508
-rw-r--r--Documentation/RelNotes/2.15.1.txt88
-rw-r--r--Documentation/RelNotes/2.15.2.txt47
-rw-r--r--Documentation/RelNotes/2.16.0.txt482
-rw-r--r--Documentation/RelNotes/2.16.1.txt11
-rw-r--r--Documentation/RelNotes/2.16.2.txt30
-rw-r--r--Documentation/SubmittingPatches377
-rw-r--r--Documentation/config.txt452
-rw-r--r--Documentation/diff-config.txt11
-rw-r--r--Documentation/diff-format.txt7
-rw-r--r--Documentation/diff-generate-patch.txt7
-rw-r--r--Documentation/diff-heuristic-options.txt5
-rw-r--r--Documentation/diff-options.txt86
-rw-r--r--Documentation/git-add.txt19
-rw-r--r--Documentation/git-annotate.txt1
-rw-r--r--Documentation/git-apply.txt11
-rw-r--r--Documentation/git-archimport.txt2
-rw-r--r--Documentation/git-bisect-lk2009.txt18
-rw-r--r--Documentation/git-bisect.txt15
-rw-r--r--Documentation/git-blame.txt2
-rw-r--r--Documentation/git-branch.txt87
-rw-r--r--Documentation/git-cat-file.txt9
-rw-r--r--Documentation/git-check-ref-format.txt24
-rw-r--r--Documentation/git-checkout.txt49
-rw-r--r--Documentation/git-clone.txt39
-rw-r--r--Documentation/git-commit.txt26
-rw-r--r--Documentation/git-config.txt13
-rw-r--r--Documentation/git-credential-cache.txt11
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-describe.txt50
-rw-r--r--Documentation/git-diff-index.txt6
-rw-r--r--Documentation/git-diff.txt14
-rw-r--r--Documentation/git-fast-import.txt2
-rw-r--r--Documentation/git-filter-branch.txt36
-rw-r--r--Documentation/git-for-each-ref.txt166
-rw-r--r--Documentation/git-format-patch.txt6
-rw-r--r--Documentation/git-grep.txt20
-rw-r--r--Documentation/git-interpret-trailers.txt64
-rw-r--r--Documentation/git-log.txt7
-rw-r--r--Documentation/git-ls-files.txt19
-rw-r--r--Documentation/git-ls-tree.txt10
-rw-r--r--Documentation/git-merge-base.txt64
-rw-r--r--Documentation/git-merge.txt20
-rw-r--r--Documentation/git-name-rev.txt13
-rw-r--r--Documentation/git-notes.txt4
-rw-r--r--Documentation/git-p4.txt8
-rw-r--r--Documentation/git-pack-objects.txt39
-rw-r--r--Documentation/git-patch-id.txt3
-rw-r--r--Documentation/git-prune.txt9
-rw-r--r--Documentation/git-pull.txt25
-rw-r--r--Documentation/git-push.txt55
-rw-r--r--Documentation/git-read-tree.txt15
-rw-r--r--Documentation/git-rebase.txt46
-rw-r--r--Documentation/git-receive-pack.txt29
-rw-r--r--Documentation/git-reflog.txt4
-rw-r--r--Documentation/git-repack.txt5
-rw-r--r--Documentation/git-rerere.txt2
-rw-r--r--Documentation/git-reset.txt4
-rw-r--r--Documentation/git-rev-list.txt4
-rw-r--r--Documentation/git-rev-parse.txt25
-rw-r--r--Documentation/git-rm.txt15
-rw-r--r--Documentation/git-send-email.txt22
-rw-r--r--Documentation/git-send-pack.txt10
-rw-r--r--Documentation/git-show.txt4
-rw-r--r--Documentation/git-stash.txt102
-rw-r--r--Documentation/git-status.txt86
-rw-r--r--Documentation/git-submodule.txt147
-rw-r--r--Documentation/git-svn.txt33
-rw-r--r--Documentation/git-tag.txt73
-rw-r--r--Documentation/git-tools.txt2
-rw-r--r--Documentation/git-update-index.txt92
-rw-r--r--Documentation/git-worktree.txt49
-rw-r--r--Documentation/git.txt581
-rw-r--r--Documentation/gitattributes.txt92
-rw-r--r--Documentation/gitcli.txt2
-rw-r--r--Documentation/gitcore-tutorial.txt10
-rw-r--r--Documentation/gitcredentials.txt20
-rw-r--r--Documentation/githooks.txt83
-rw-r--r--Documentation/gitignore.txt11
-rw-r--r--Documentation/gitmodules.txt35
-rw-r--r--Documentation/gitremote-helpers.txt2
-rw-r--r--Documentation/gitrepository-layout.txt6
-rw-r--r--Documentation/gitsubmodules.txt279
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/gitweb.conf.txt4
-rw-r--r--Documentation/gitweb.txt2
-rw-r--r--Documentation/gitworkflows.txt6
-rw-r--r--Documentation/glossary-content.txt31
-rw-r--r--Documentation/howto/rebuild-from-update-hook.txt4
-rw-r--r--Documentation/i18n.txt10
-rwxr-xr-xDocumentation/install-doc-quick.sh9
-rw-r--r--Documentation/merge-config.txt4
-rw-r--r--Documentation/merge-options.txt18
-rw-r--r--Documentation/merge-strategies.txt8
-rw-r--r--Documentation/pretty-formats.txt30
-rw-r--r--Documentation/pull-fetch-param.txt6
-rw-r--r--Documentation/rebase-config.txt52
-rw-r--r--Documentation/rev-list-options.txt72
-rw-r--r--Documentation/revisions.txt12
-rw-r--r--Documentation/technical/api-argv-array.txt2
-rw-r--r--Documentation/technical/api-builtin.txt73
-rw-r--r--Documentation/technical/api-config.txt2