summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--.mailmap6
-rw-r--r--.travis.yml21
-rw-r--r--Documentation/Makefile22
-rw-r--r--Documentation/RelNotes/2.12.0.txt500
-rw-r--r--Documentation/RelNotes/2.12.1.txt41
-rw-r--r--Documentation/RelNotes/2.12.2.txt83
-rw-r--r--Documentation/SubmittingPatches13
-rw-r--r--Documentation/asciidoctor-extensions.rb28
-rw-r--r--Documentation/blame-options.txt4
-rwxr-xr-xDocumentation/cat-texi.perl21
-rw-r--r--Documentation/config.txt115
-rw-r--r--Documentation/diff-config.txt19
-rw-r--r--Documentation/diff-heuristic-options.txt2
-rw-r--r--Documentation/diff-options.txt36
-rw-r--r--Documentation/git-branch.txt7
-rw-r--r--Documentation/git-check-ref-format.txt6
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-difftool.txt5
-rw-r--r--Documentation/git-for-each-ref.txt5
-rw-r--r--Documentation/git-format-patch.txt2
-rw-r--r--Documentation/git-gc.txt2
-rw-r--r--Documentation/git-grep.txt14
-rw-r--r--Documentation/git-gui.txt2
-rw-r--r--Documentation/git-init.txt4
-rw-r--r--Documentation/git-merge.txt8
-rw-r--r--Documentation/git-p4.txt15
-rw-r--r--Documentation/git-push.txt13
-rw-r--r--Documentation/git-rebase.txt7
-rw-r--r--Documentation/git-relink.txt30
-rw-r--r--Documentation/git-reset.txt48
-rw-r--r--Documentation/git-rev-parse.txt3
-rw-r--r--Documentation/git-send-email.txt2
-rw-r--r--Documentation/git-shortlog.txt4
-rw-r--r--Documentation/git-stash.txt5
-rw-r--r--Documentation/git-submodule.txt81
-rw-r--r--Documentation/git-tag.txt16
-rw-r--r--Documentation/git-verify-tag.txt2
-rw-r--r--Documentation/git-worktree.txt2
-rw-r--r--Documentation/git.txt45
-rw-r--r--Documentation/gitcore-tutorial.txt2
-rw-r--r--Documentation/gitcvs-migration.txt2
-rw-r--r--Documentation/gitdiffcore.txt12
-rw-r--r--Documentation/giteveryday.txt17
-rw-r--r--Documentation/gitglossary.txt2
-rw-r--r--Documentation/gitk.txt14
-rw-r--r--Documentation/gitremote-helpers.txt10
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/gittutorial-2.txt2
-rw-r--r--Documentation/gittutorial.txt2
-rw-r--r--Documentation/gitworkflows.txt2
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/rev-list-options.txt4
-rw-r--r--Documentation/technical/api-hashmap.txt4
-rw-r--r--Documentation/technical/api-setup.txt2
-rw-r--r--Documentation/technical/api-submodule-config.txt14
-rw-r--r--Documentation/texi.xsl26
-rw-r--r--Documentation/user-manual.txt8
-rwxr-xr-xGIT-VERSION-GEN4
-rw-r--r--Makefile41
-rw-r--r--README.md6
l---------RelNotes2
-rw-r--r--abspath.c238
-rw-r--r--apply.c25
-rw-r--r--bisect.c11
-rw-r--r--branch.c2
-rw-r--r--builtin.h1
-rw-r--r--builtin/add.c2
-rw-r--r--builtin/am.c6
-rw-r--r--builtin/blame.c9
-rw-r--r--builtin/branch.c28
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/checkout.c21
-rw-r--r--builtin/clean.c10
-rw-r--r--builtin/clone.c8
-rw-r--r--builtin/commit.c41
-rw-r--r--builtin/diff-tree.c4
-rw-r--r--builtin/diff.c9
-rw-r--r--builtin/difftool.c692
-rw-r--r--builtin/fetch.c4
-rw-r--r--builtin/for-each-ref.c5
-rw-r--r--builtin/fsck.c164
-rw-r--r--builtin/gc.c57
-rw-r--r--builtin/grep.c464
-rw-r--r--builtin/init-db.c8
-rw-r--r--builtin/ls-files.c21
-rw-r--r--builtin/ls-tree.c16
-rw-r--r--builtin/merge-index.c2
-rw-r--r--builtin/merge.c33
-rw-r--r--builtin/mv.c52
-rw-r--r--builtin/pack-objects.c133
-rw-r--r--builtin/push.c2
-rw-r--r--builtin/read-tree.c38
-rw-r--r--builtin/receive-pack.c12
-rw-r--r--builtin/remote.c18
-rw-r--r--builtin/reset.c2
-rw-r--r--builtin/rev-list.c2
-rw-r--r--builtin/rm.c82
-rw-r--r--builtin/shortlog.c15
-rw-r--r--builtin/show-branch.c42
-rw-r--r--builtin/show-ref.c49
-rw-r--r--builtin/submodule--helper.c101
-rw-r--r--builtin/tag.c41
-rw-r--r--builtin/update-index.c1
-rw-r--r--builtin/verify-tag.c22
-rw-r--r--builtin/worktree.c4
-rw-r--r--cache.h79
-rwxr-xr-xci/run-linux32-build.sh30
-rw-r--r--color.c12
-rw-r--r--command-list.txt1
-rw-r--r--commit.c44
-rw-r--r--commit.h2
-rw-r--r--compat/qsort_s.c69
-rw-r--r--compat/winansi.c4
-rw-r--r--config.c228
-rw-r--r--config.mak.uname21
-rw-r--r--configure.ac6
-rw-r--r--contrib/coccinelle/array.cocci16
-rw-r--r--contrib/coccinelle/free.cocci6
-rw-r--r--contrib/coccinelle/strbuf.cocci6
-rw-r--r--contrib/coccinelle/swap.cocci28
-rw-r--r--contrib/coccinelle/xstrdup_or_null.cocci6
-rw-r--r--contrib/completion/git-completion.bash153
-rw-r--r--contrib/convert-objects/convert-objects.c329
-rw-r--r--contrib/convert-objects/git-convert-objects.txt29
-rwxr-xr-xcontrib/examples/git-difftool.perl (renamed from git-difftool.perl)22
-rwxr-xr-xcontrib/gitview/gitview1305
-rw-r--r--contrib/gitview/gitview.txt57
-rwxr-xr-xcontrib/remote-helpers/git-remote-bzr16
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg16
-rw-r--r--di