summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes6
-rw-r--r--.gitignore6
-rw-r--r--.mailmap15
-rw-r--r--.travis.yml3
-rw-r--r--Documentation/Makefile3
-rw-r--r--Documentation/RelNotes/1.7.11.7.txt2
-rw-r--r--Documentation/RelNotes/2.17.0.txt2
-rw-r--r--Documentation/RelNotes/2.18.0.txt583
-rw-r--r--Documentation/RelNotes/2.19.0.txt159
-rw-r--r--Documentation/SubmittingPatches29
-rw-r--r--Documentation/config.txt136
-rw-r--r--Documentation/diff-config.txt3
-rw-r--r--Documentation/diff-options.txt14
-rw-r--r--Documentation/fetch-options.txt8
-rw-r--r--Documentation/git-add.txt4
-rw-r--r--Documentation/git-annotate.txt2
-rw-r--r--Documentation/git-apply.txt20
-rw-r--r--Documentation/git-bisect-lk2009.txt2
-rw-r--r--Documentation/git-bisect.txt4
-rw-r--r--Documentation/git-branch.txt7
-rw-r--r--Documentation/git-bundle.txt4
-rw-r--r--Documentation/git-check-attr.txt4
-rw-r--r--Documentation/git-check-ignore.txt4
-rw-r--r--Documentation/git-check-mailmap.txt2
-rw-r--r--Documentation/git-clone.txt4
-rw-r--r--Documentation/git-commit-graph.txt94
-rw-r--r--Documentation/git-config.txt81
-rw-r--r--Documentation/git-credential-cache.txt2
-rw-r--r--Documentation/git-credential-store.txt2
-rw-r--r--Documentation/git-cvsserver.txt12
-rw-r--r--Documentation/git-diff-index.txt6
-rw-r--r--Documentation/git-diff-tree.txt2
-rw-r--r--Documentation/git-diff.txt26
-rw-r--r--Documentation/git-fast-export.txt4
-rw-r--r--Documentation/git-fast-import.txt24
-rw-r--r--Documentation/git-fetch-pack.txt2
-rw-r--r--Documentation/git-filter-branch.txt16
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
-rw-r--r--Documentation/git-for-each-ref.txt2
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-gc.txt53
-rw-r--r--Documentation/git-grep.txt11
-rw-r--r--Documentation/git-help.txt9
-rw-r--r--Documentation/git-http-fetch.txt13
-rw-r--r--Documentation/git-http-push.txt2
-rw-r--r--Documentation/git-imap-send.txt8
-rw-r--r--Documentation/git-index-pack.txt4
-rw-r--r--Documentation/git-interpret-trailers.txt4
-rw-r--r--Documentation/git-log.txt8
-rw-r--r--Documentation/git-ls-files.txt7
-rw-r--r--Documentation/git-ls-remote.txt24
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-mktree.txt2
-rw-r--r--Documentation/git-name-rev.txt4
-rw-r--r--Documentation/git-notes.txt2
-rw-r--r--Documentation/git-p4.txt71
-rw-r--r--Documentation/git-pack-objects.txt26
-rw-r--r--Documentation/git-prune.txt6
-rw-r--r--Documentation/git-pull.txt8
-rw-r--r--Documentation/git-push.txt9
-rw-r--r--Documentation/git-read-tree.txt4
-rw-r--r--Documentation/git-rebase.txt303
-rw-r--r--Documentation/git-receive-pack.txt10
-rw-r--r--Documentation/git-remote-ext.txt12
-rw-r--r--Documentation/git-remote.txt6
-rw-r--r--Documentation/git-repack.txt13
-rw-r--r--Documentation/git-replace.txt11
-rw-r--r--Documentation/git-request-pull.txt4
-rw-r--r--Documentation/git-rev-parse.txt6
-rw-r--r--Documentation/git-send-email.txt24
-rw-r--r--Documentation/git-send-pack.txt2
-rw-r--r--Documentation/git-shell.txt4
-rw-r--r--Documentation/git-shortlog.txt6
-rw-r--r--Documentation/git-show-branch.txt4
-rw-r--r--Documentation/git-show-index.txt26
-rw-r--r--Documentation/git-show-ref.txt4
-rw-r--r--Documentation/git-show.txt4
-rw-r--r--Documentation/git-status.txt14
-rw-r--r--Documentation/git-submodule.txt40
-rw-r--r--Documentation/git-svn.txt19
-rw-r--r--Documentation/git-tag.txt4
-rw-r--r--Documentation/git-update-index.txt20
-rw-r--r--Documentation/git-update-ref.txt2
-rw-r--r--Documentation/git-var.txt4
-rw-r--r--Documentation/git-web--browse.txt4
-rw-r--r--Documentation/git-worktree.txt29
-rw-r--r--Documentation/git.txt13
-rw-r--r--Documentation/gitattributes.txt94
-rw-r--r--Documentation/gitcli.txt4
-rw-r--r--Documentation/giteveryday.txt2
-rw-r--r--Documentation/githooks.txt115
-rw-r--r--Documentation/gitignore.txt2
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitmodules.txt2
-rw-r--r--Documentation/gitremote-helpers.txt32
-rw-r--r--Documentation/gitrepository-layout.txt5
-rw-r--r--Documentation/gitrevisions.txt2
-rw-r--r--Documentation/gitsubmodules.txt2
-rw-r--r--Documentation/gitworkflows.txt2
-rw-r--r--Documentation/glossary-content.txt4
-rw-r--r--Documentation/howto/recover-corrupted-object-harder.txt2
-rw-r--r--Documentation/merge-config.txt8
-rw-r--r--Documentation/merge-strategies.txt11
-rw-r--r--Documentation/revisions.txt8
-rw-r--r--Documentation/technical/api-config.txt18
-rw-r--r--Documentation/technical/api-directory-listing.txt4
-rw-r--r--Documentation/technical/api-gitattributes.txt2
-rw-r--r--Documentation/technical/api-object-access.txt2
-rw-r--r--Documentation/technical/api-oid-array.txt17
-rw-r--r--Documentation/technical/api-submodule-config.txt2
-rw-r--r--Documentation/technical/commit-graph-format.txt97
-rw-r--r--Documentation/technical/commit-graph.txt182
-rw-r--r--Documentation/technical/directory-rename-detection.txt115
-rw-r--r--Documentation/technical/hash-function-transition.txt40
-rw-r--r--Documentation/technical/pack-format.txt92
-rw-r--r--Documentation/technical/protocol-v2.txt413
-rw-r--r--Documentation/technical/shallow.txt20
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile394
-rw-r--r--README.md3
l---------RelNotes2
-rw-r--r--advice.c102
-rw-r--r--advice.h2
-rw-r--r--alias.c22
-rw-r--r--alias.h12
-rw-r--r--alloc.c67
-rw-r--r--alloc.h19
-rw-r--r--