summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitattributes8
-rw-r--r--.travis.yml18
-rw-r--r--Documentation/CodingGuidelines12
-rw-r--r--Documentation/RelNotes/2.13.1.txt114
-rw-r--r--Documentation/RelNotes/2.13.2.txt37
-rw-r--r--Documentation/config.txt50
-rw-r--r--Documentation/git-bisect-lk2009.txt4
-rw-r--r--Documentation/git-filter-branch.txt5
-rw-r--r--Documentation/git-interpret-trailers.txt2
-rw-r--r--Documentation/git-pull.txt6
-rw-r--r--Documentation/git-read-tree.txt2
-rw-r--r--Documentation/git-rev-parse.txt12
-rw-r--r--Documentation/git-tag.txt2
-rw-r--r--Documentation/git.txt510
-rw-r--r--Documentation/gitcredentials.txt20
-rw-r--r--Documentation/gitweb.txt2
-rw-r--r--Documentation/pretty-formats.txt2
-rw-r--r--Documentation/technical/api-directory-listing.txt6
-rw-r--r--Documentation/technical/pack-protocol.txt32
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile9
l---------RelNotes2
-rw-r--r--apply.c338
-rw-r--r--bisect.c8
-rw-r--r--builtin/am.c59
-rw-r--r--builtin/blame.c15
-rw-r--r--builtin/cat-file.c1
-rw-r--r--builtin/checkout.c26
-rw-r--r--builtin/clean.c42
-rw-r--r--builtin/clone.c4
-rw-r--r--builtin/commit.c2
-rw-r--r--builtin/config.c3
-rw-r--r--builtin/difftool.c33
-rw-r--r--builtin/fast-export.c2
-rw-r--r--builtin/log.c4
-rw-r--r--builtin/mailsplit.c10
-rw-r--r--builtin/mktree.c5
-rw-r--r--builtin/name-rev.c66
-rw-r--r--builtin/notes.c6
-rw-r--r--builtin/pack-objects.c6
-rw-r--r--builtin/pack-redundant.c1
-rw-r--r--builtin/pull.c25
-rw-r--r--builtin/read-tree.c7
-rw-r--r--builtin/receive-pack.c55
-rw-r--r--builtin/remote.c7
-rw-r--r--builtin/worktree.c8
-rwxr-xr-xci/test-documentation.sh15
-rw-r--r--commit.c13
-rw-r--r--compat/mingw.c4
-rw-r--r--compat/mingw.h6
-rw-r--r--compat/winansi.c12
-rw-r--r--config.c5
-rw-r--r--config.mak.uname1
-rw-r--r--connect.c2
-rw-r--r--contrib/completion/.gitattributes1
-rw-r--r--contrib/completion/git-completion.bash8
-rw-r--r--contrib/persistent-https/README10
-rw-r--r--contrib/workdir/.gitattributes1
-rw-r--r--dir.c43
-rw-r--r--dir.h6
-rw-r--r--environment.c2
-rw-r--r--git-compat-util.h10
-rwxr-xr-xgit-filter-branch.sh2
-rw-r--r--git-gui/.gitattributes1
-rw-r--r--git-rebase--interactive.sh2
-rwxr-xr-xgit-send-email.perl54
-rwxr-xr-xgitweb/gitweb.perl2
-rw-r--r--help.c47
-rw-r--r--line-log.c1
-rw-r--r--mailinfo.c9
-rw-r--r--notes-utils.c7
-rw-r--r--parse-options.c6
-rw-r--r--patch-ids.c3
-rw-r--r--read-cache.c13
-rw-r--r--ref-filter.c28
-rw-r--r--reflog-walk.c20
-rw-r--r--remote.c40
-rw-r--r--revision.c2
-rw-r--r--run-command.c457
-rw-r--r--run-command.h1
-rw-r--r--sequencer.c19
-rw-r--r--setup.c11
-rw-r--r--sha1dc/.gitattributes1
-rw-r--r--sha1dc/sha1.c109
-rw-r--r--sha1dc/sha1.h90
-rw-r--r--sha1dc/ubc_check.c13
-rw-r--r--sha1dc/ubc_check.h14
-rw-r--r--sha1dc_git.c24
-rw-r--r--sha1dc_git.h19
-rw-r--r--shallow.c8
-rw-r--r--string-list.c18
-rw-r--r--string-list.h7
-rw-r--r--submodule.c21
-rw-r--r--t/.gitattributes22
-rwxr-xr-xt/lib-submodule-update.sh7
-rwxr-xr-xt/perf/p0004-lazy-init-name-hash.sh47
-rwxr-xr-xt/t0025-crlf-auto.sh181
-rwxr-xr-xt/t0027-auto-crlf.sh8
-rwxr-xr-xt/t0061-run-command.sh41
-rwxr-xr-xt/t0203-gettext-setlocale-sanity.sh4
-rwxr-xr-xt/t1013-read-tree-submodule.sh1
-rwxr-xr-xt/t1300-repo-config.sh6
-rwxr-xr-xt/t1309-early-config.sh2
-rwxr-xr-xt/t1430-bad-ref-name.sh2
-rwxr-xr-xt/t2013-checkout-submodule.sh1
-rwxr-xr-xt/t3070-wildmatch.sh1
-rwxr-xr-xt/t3200-branch.sh2
-rwxr-xr-xt/t3203-branch-output.sh2
-rwxr-xr-xt/t3404-rebase-interactive.sh14
-rwxr-xr-xt/t3415-rebase-autosquash.sh10
-rwxr-xr-xt/t3511-cherry-pick-x.sh44
-rwxr-xr-xt/t3901-i18n-patch.sh38
-rwxr-xr-xt/t3901/8859-1.txt (renamed from t/t3901-8859-1.txt)0
-rwxr-xr-xt/t3901/utf8.txt (renamed from t/t3901-utf8.txt)0
-rwxr-xr-xt/t3903-stash.sh4
-rwxr-xr-xt/t4038-diff-combined.sh2
-rwxr-xr-xt/t4202-log.sh14
-rwxr-xr-xt/t4205-log-pretty-formats.sh4
-rwxr-xr-xt/t5310-pack-bitmaps.sh48
-rwxr-xr-xt/t5316-pack-delta-depth.sh8
-rwxr-xr-xt/t5400-send-pack.sh5
-rwxr-xr-xt/t5520-pull.sh18
-rwxr-xr-xt/t5531-deep-submodule-push.sh4
-rwxr-xr-xt/t5534-push-signed.sh37
-rwxr-xr-xt/t5545-push-options.sh85
-rwxr-xr-xt/t5550-http-fetch-dumb.sh5
-rwxr-xr-xt/t5611-clone-config.sh8
-rwxr-xr-xt/t6134-pathspec-in-submodule.sh4
-rwxr-xr-xt/t6501-freshen-objects.sh27
-rwxr-xr-xt/t7004-tag.sh4
-rwxr-xr-xt/t7061-wtstatus-ignore.sh1
-rwxr-xr-xt/t7300-clean.sh16
-rwxr-xr-x