summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes6
-rw-r--r--.gitignore2
-rw-r--r--.mailmap4
-rw-r--r--.travis.yml3
-rw-r--r--Documentation/Makefile2
-rw-r--r--Documentation/RelNotes/1.7.11.7.txt2
-rw-r--r--Documentation/RelNotes/2.13.7.txt20
-rw-r--r--Documentation/RelNotes/2.14.4.txt5
-rw-r--r--Documentation/RelNotes/2.15.2.txt3
-rw-r--r--Documentation/RelNotes/2.16.4.txt5
-rw-r--r--Documentation/RelNotes/2.17.0.txt2
-rw-r--r--Documentation/RelNotes/2.17.1.txt16
-rw-r--r--Documentation/RelNotes/2.18.0.txt279
-rw-r--r--Documentation/RelNotes/2.19.0.txt14
-rw-r--r--Documentation/SubmittingPatches21
-rw-r--r--Documentation/config.txt71
-rw-r--r--Documentation/diff-config.txt3
-rw-r--r--Documentation/diff-options.txt10
-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.txt10
-rw-r--r--Documentation/git-branch.txt4
-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.txt2
-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-filter-branch.txt8
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
-rw-r--r--Documentation/git-gc.txt23
-rw-r--r--Documentation/git-grep.txt2
-rw-r--r--Documentation/git-help.txt4
-rw-r--r--Documentation/git-http-push.txt2
-rw-r--r--Documentation/git-imap-send.txt4
-rw-r--r--Documentation/git-index-pack.txt4
-rw-r--r--Documentation/git-interpret-trailers.txt4
-rw-r--r--Documentation/git-ls-files.txt7
-rw-r--r--Documentation/git-ls-remote.txt8
-rw-r--r--Documentation/git-merge.txt2
-rw-r--r--Documentation/git-name-rev.txt4
-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.txt7
-rw-r--r--Documentation/git-read-tree.txt4
-rw-r--r--Documentation/git-rebase.txt167
-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.txt6
-rw-r--r--Documentation/git-send-pack.txt2
-rw-r--r--Documentation/git-shell.txt4
-rw-r--r--Documentation/git-show-branch.txt4
-rw-r--r--Documentation/git-show-ref.txt4
-rw-r--r--Documentation/git-show.txt4
-rw-r--r--Documentation/git-status.txt10
-rw-r--r--Documentation/git-submodule.txt21
-rw-r--r--Documentation/git-svn.txt4
-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.txt9
-rw-r--r--Documentation/git.txt13
-rw-r--r--Documentation/gitattributes.txt6
-rw-r--r--Documentation/gitcli.txt4
-rw-r--r--Documentation/githooks.txt115
-rw-r--r--Documentation/gitmodules.txt2
-rw-r--r--Documentation/gitrevisions.txt2
-rw-r--r--Documentation/gitworkflows.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-oid-array.txt17
-rw-r--r--Documentation/technical/pack-format.txt92
-rw-r--r--Documentation/technical/protocol-v2.txt19
-rw-r--r--Documentation/technical/shallow.txt20
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile39
-rw-r--r--README.md3
l---------RelNotes2
-rw-r--r--advice.c2
-rw-r--r--advice.h1
-rw-r--r--alias.c22
-rw-r--r--alias.h12
-rw-r--r--apply.c10
-rw-r--r--archive-tar.c4
-rw-r--r--archive-zip.c3
-rw-r--r--archive.c6
-rw-r--r--argv-array.c26
-rw-r--r--argv-array.h6
-rw-r--r--attr.c10
-rw-r--r--blame.c24
-rw-r--r--branch.c7
-rw-r--r--builtin/add.c3
-rw-r--r--builtin/am.c40
-rw-r--r--builtin/blame.c132
-rw-r--r--builtin/branch.c8
-rw-r--r--builtin/cat-file.c16
-rw-r--r--builtin/checkout.c19
-rw-r--r--builtin/clone.c15
-rw-r--r--builtin/column.c1
-rw-r--r--builtin/commit.c46
-rw-r--r--builtin/config.c5
-rw-r--r--builtin/count-objects.c2
-rw-r--r--builtin/describe.c4
-rw-r--r--builtin/diff.c2
-rw-r--r--builtin/difftool.c11
-rw-r--r--builtin/fast-export.c39
-rw-r--r--builtin/fetch.c150
-rw-r--r--builtin/fsck.c50
-rw-r--r--builtin/gc.c167
-rw-r--r--builtin/grep.c9
-rw-r--r--builtin/help.c40