summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.mailmap2
-rw-r--r--.travis.yml7
-rw-r--r--Documentation/RelNotes/2.10.0.txt675
-rw-r--r--Documentation/RelNotes/2.10.1.txt131
-rw-r--r--Documentation/RelNotes/2.10.2.txt111
-rw-r--r--Documentation/RelNotes/2.10.3.txt55
-rw-r--r--Documentation/RelNotes/2.10.4.txt4
-rw-r--r--Documentation/RelNotes/2.3.10.txt2
-rw-r--r--Documentation/RelNotes/2.4.10.txt2
-rw-r--r--Documentation/RelNotes/2.5.4.txt2
-rw-r--r--Documentation/RelNotes/2.6.1.txt2
-rw-r--r--Documentation/config.txt146
-rw-r--r--Documentation/git-add.txt7
-rw-r--r--Documentation/git-am.txt3
-rw-r--r--Documentation/git-check-ref-format.txt4
-rw-r--r--Documentation/git-checkout.txt12
-rw-r--r--Documentation/git-commit.txt6
-rw-r--r--Documentation/git-cvsimport.txt2
-rw-r--r--Documentation/git-fast-import.txt2
-rw-r--r--Documentation/git-fetch.txt51
-rw-r--r--Documentation/git-fmt-merge-msg.txt4
-rw-r--r--Documentation/git-fsck.txt9
-rw-r--r--Documentation/git-log.txt4
-rw-r--r--Documentation/git-ls-files.txt3
-rw-r--r--Documentation/git-mailsplit.txt7
-rw-r--r--Documentation/git-merge-base.txt26
-rw-r--r--Documentation/git-push.txt8
-rw-r--r--Documentation/git-remote-fd.txt2
-rw-r--r--Documentation/git-repack.txt13
-rw-r--r--Documentation/git-shell.txt16
-rw-r--r--Documentation/git-submodule.txt15
-rw-r--r--Documentation/git-svn.txt3
-rw-r--r--Documentation/git-tag.txt5
-rw-r--r--Documentation/git-upload-pack.txt16
-rw-r--r--Documentation/git-worktree.txt49
-rw-r--r--Documentation/git.txt15
-rw-r--r--Documentation/gitattributes.txt62
-rw-r--r--Documentation/gitcvs-migration.txt6
-rw-r--r--Documentation/githooks.txt18
-rw-r--r--Documentation/gitk.txt2
-rw-r--r--Documentation/gitmodules.txt12
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gitrevisions.txt6
-rw-r--r--Documentation/howto/revert-a-faulty-merge.txt16
-rw-r--r--Documentation/pretty-formats.txt5
-rw-r--r--Documentation/rev-list-options.txt13
-rw-r--r--Documentation/revisions.txt125
-rw-r--r--Documentation/technical/pack-protocol.txt10
-rw-r--r--Documentation/technical/protocol-capabilities.txt9
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile76
l---------RelNotes2
-rw-r--r--advice.c23
-rw-r--r--archive-tar.c77
-rw-r--r--archive.c12
-rw-r--r--bisect.c63
-rw-r--r--branch.c3
-rw-r--r--branch.h22
-rw-r--r--builtin/add.c47
-rw-r--r--builtin/am.c206
-rw-r--r--builtin/apply.c1438
-rw-r--r--builtin/blame.c33
-rw-r--r--builtin/branch.c34
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/checkout.c27
-rw-r--r--builtin/clone.c23
-rw-r--r--builtin/commit.c16
-rw-r--r--builtin/config.c3
-rw-r--r--builtin/fast-export.c10
-rw-r--r--builtin/fetch.c216
-rw-r--r--builtin/fmt-merge-msg.c2
-rw-r--r--builtin/fsck.c80
-rw-r--r--builtin/gc.c2
-rw-r--r--builtin/index-pack.c10
-rw-r--r--builtin/init-db.c17
-rw-r--r--builtin/interpret-trailers.c2
-rw-r--r--builtin/log.c116
-rw-r--r--builtin/ls-files.c3
-rw-r--r--builtin/mailsplit.c18
-rw-r--r--builtin/merge-base.c3
-rw-r--r--builtin/merge-recursive.c20
-rw-r--r--builtin/merge.c76
-rw-r--r--builtin/mv.c2
-rw-r--r--builtin/notes.c29
-rw-r--r--builtin/pack-objects.c102
-rw-r--r--builtin/pull.c5
-rw-r--r--builtin/push.c21
-rw-r--r--builtin/receive-pack.c192
-rw-r--r--builtin/remote.c29
-rw-r--r--builtin/repack.c12
-rw-r--r--builtin/reset.c8
-rw-r--r--builtin/rev-list.c17
-rw-r--r--builtin/shortlog.c21
-rw-r--r--builtin/submodule--helper.c139
-rw-r--r--builtin/symbolic-ref.c2
-rw-r--r--builtin/unpack-objects.c4
-rw-r--r--builtin/update-index.c22
-rw-r--r--builtin/worktree.c87
-rw-r--r--cache.h77
-rw-r--r--color.c37
-rw-r--r--color.h15
-rw-r--r--combine-diff.c16
-rw-r--r--commit-slab.h8
-rw-r--r--commit.c12
-rw-r--r--commit.h10
-rw-r--r--common-main.c2
-rw-r--r--compat/nedmalloc/nedmalloc.c16
-rw-r--r--compat/strdup.c11
-rw-r--r--config.c231
-rw-r--r--config.mak.uname3
-rw-r--r--configure.ac34
-rw-r--r--connect.c15
-rw-r--r--connected.c71
-rw-r--r--connected.h37
-rw-r--r--contrib/coccinelle/.gitignore1
-rw-r--r--contrib/coccinelle/README2
-rw-r--r--contrib/coccinelle/array.cocci26
-rw-r--r--contrib/coccinelle/free.cocci5
-rw-r--r--contrib/coccinelle/object_id.cocci110
-rw-r--r--contrib/coccinelle/strbuf.cocci40
-rw-r--r--contrib/coccinelle/xstrdup_or_null.cocci7
-rw-r--r--contrib/completion/git-completion.bash157
-rw-r--r--contrib/diff-highlight/Makefile5
-rwxr-xr-xcontrib/diff-highlight/diff-highlight19
-rw-r--r--contrib/diff-highlight/t/.gitignore2
-rw-r--r--contrib/diff-highlight/t/Makefile22
-rwxr-xr-xcontrib/diff-highlight/t/t9400-diff-highlight.sh296
-rw-r--r--contrib/git-jump/README6
-rwxr-xr-xcontrib/git-jump/git-jump8
-rw-r--r--contrib/hooks/multimail/CHANGES59
-rw-r--r--contrib/hooks/multimail/CONTRIBUTING.rst9