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--.gitmodules4
-rw-r--r--.mailmap4
-rw-r--r--.travis.yml99
-rw-r--r--.tsan-suppressions10
-rw-r--r--Documentation/CodingGuidelines12
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/RelNotes/1.7.10.1.txt2
-rw-r--r--Documentation/RelNotes/2.10.3.txt7
-rw-r--r--Documentation/RelNotes/2.10.4.txt4
-rw-r--r--Documentation/RelNotes/2.10.5.txt17
-rw-r--r--Documentation/RelNotes/2.11.2.txt12
-rw-r--r--Documentation/RelNotes/2.11.3.txt4
-rw-r--r--Documentation/RelNotes/2.11.4.txt17
-rw-r--r--Documentation/RelNotes/2.12.0.txt2
-rw-r--r--Documentation/RelNotes/2.12.1.txt41
-rw-r--r--Documentation/RelNotes/2.12.2.txt83
-rw-r--r--Documentation/RelNotes/2.12.3.txt64
-rw-r--r--Documentation/RelNotes/2.12.4.txt4
-rw-r--r--Documentation/RelNotes/2.12.5.txt17
-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.4.12.txt12
-rw-r--r--Documentation/RelNotes/2.5.6.txt12
-rw-r--r--Documentation/RelNotes/2.6.7.txt12
-rw-r--r--Documentation/RelNotes/2.7.5.txt14
-rw-r--r--Documentation/RelNotes/2.7.6.txt25
-rw-r--r--Documentation/RelNotes/2.8.5.txt12
-rw-r--r--Documentation/RelNotes/2.8.6.txt4
-rw-r--r--Documentation/RelNotes/2.9.4.txt7
-rw-r--r--Documentation/RelNotes/2.9.5.txt4
-rw-r--r--Documentation/SubmittingPatches24
-rw-r--r--Documentation/config.txt304
-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-options.txt60
-rw-r--r--Documentation/git-add.txt10
-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.txt2
-rw-r--r--Documentation/git-branch.txt74
-rw-r--r--Documentation/git-cat-file.txt2
-rw-r--r--Documentation/git-checkout.txt39
-rw-r--r--Documentation/git-clone.txt28
-rw-r--r--Documentation/git-commit.txt26
-rw-r--r--Documentation/git-config.txt8
-rw-r--r--Documentation/git-credential-cache.txt11
-rw-r--r--Documentation/git-cvsserver.txt2
-rw-r--r--Documentation/git-describe.txt35
-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.txt50
-rw-r--r--Documentation/git-for-each-ref.txt67
-rw-r--r--Documentation/git-format-patch.txt8
-rw-r--r--Documentation/git-grep.txt20
-rw-r--r--Documentation/git-interpret-trailers.txt62
-rw-r--r--Documentation/git-ls-files.txt12
-rw-r--r--Documentation/git-ls-tree.txt10
-rw-r--r--Documentation/git-merge.txt26
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-pack-objects.txt17
-rw-r--r--Documentation/git-patch-id.txt3
-rw-r--r--Documentation/git-pull.txt25
-rw-r--r--Documentation/git-push.txt45
-rw-r--r--Documentation/git-read-tree.txt10
-rw-r--r--Documentation/git-rebase.txt27
-rw-r--r--Documentation/git-receive-pack.txt29
-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-parse.txt21
-rw-r--r--Documentation/git-rm.txt15
-rw-r--r--Documentation/git-send-email.txt18
-rw-r--r--Documentation/git-send-pack.txt10
-rw-r--r--Documentation/git-shell.txt16
-rw-r--r--Documentation/git-stash.txt81
-rw-r--r--Documentation/git-status.txt25
-rw-r--r--Documentation/git-submodule.txt131
-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.txt47
-rw-r--r--Documentation/git-worktree.txt7
-rw-r--r--Documentation/git.txt513
-rw-r--r--Documentation/gitattributes.txt80
-rw-r--r--Documentation/gitcli.txt2
-rw-r--r--Documentation/gitcore-tutorial.txt10
-rw-r--r--Documentation/gitcredentials.txt20
-rw-r--r--Documentation/gitdiffcore.txt10
-rw-r--r--Documentation/githooks.txt32
-rw-r--r--Documentation/gitmodules.txt35
-rw-r--r--Documentation/gitremote-helpers.txt2
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitsubmodules.txt221
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/gitweb.conf.txt4
-rw-r--r--Documentation/gitweb.txt2
-rw-r--r--Documentation/glossary-content.txt27
-rw-r--r--Documentation/howto/rebuild-from-update-hook.txt4
-rw-r--r--Documentation/i18n.txt10
-rw-r--r--Documentation/merge-options.txt8
-rw-r--r--Documentation/merge-strategies.txt3
-rw-r--r--Documentation/pretty-formats.txt28
-rw-r--r--Documentation/pull-fetch-param.txt6
-rw-r--r--Documentation/rev-list-options.txt26
-rw-r--r--Documentation/revisions.txt10
-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
-rw-r--r--Documentation/technical/api-directory-listing.txt6
-rw-r--r--Documentation/technical/api-hashmap.txt287