summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.16.1.txt11
-rw-r--r--Documentation/RelNotes/2.17.0.txt84
-rw-r--r--Documentation/config.txt4
-rw-r--r--Documentation/diff-options.txt10
-rw-r--r--Documentation/git-cat-file.txt7
-rw-r--r--Documentation/git-commit.txt2
-rw-r--r--Documentation/git-pack-objects.txt11
-rw-r--r--Documentation/git-read-tree.txt5
-rw-r--r--Documentation/git-status.txt23
-rw-r--r--Documentation/git-submodule.txt16
-rw-r--r--Documentation/gitremote-helpers.txt7
-rw-r--r--Documentation/gitsubmodules.txt100
-rw-r--r--Documentation/rev-list-options.txt11
-rw-r--r--Documentation/technical/pack-protocol.txt8
-rw-r--r--Documentation/technical/protocol-capabilities.txt8
-rw-r--r--Documentation/technical/repository-version.txt12
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--INSTALL17
-rw-r--r--Makefile68
l---------RelNotes2
-rw-r--r--apply.c6
-rw-r--r--bisect.c36
-rw-r--r--builtin/am.c2
-rw-r--r--builtin/cat-file.c2
-rw-r--r--builtin/checkout.c13
-rw-r--r--builtin/clone.c53
-rw-r--r--builtin/commit.c10
-rw-r--r--builtin/describe.c9
-rw-r--r--builtin/fetch-pack.c18
-rw-r--r--builtin/fetch.c83
-rw-r--r--builtin/fsck.c26
-rw-r--r--builtin/gc.c3
-rw-r--r--builtin/index-pack.c111
-rw-r--r--builtin/log.c4
-rw-r--r--builtin/pack-objects.c47
-rw-r--r--builtin/prune.c7
-rw-r--r--builtin/repack.c8
-rw-r--r--builtin/rev-list.c71
-rw-r--r--builtin/rev-parse.c4
-rw-r--r--builtin/submodule--helper.c340
-rw-r--r--bundle.c35
-rw-r--r--cache.h30
-rw-r--r--combine-diff.c4
-rw-r--r--commit.c19
-rw-r--r--commit.h1
-rw-r--r--config.c12
-rw-r--r--connected.c2
-rwxr-xr-xcontrib/examples/git-difftool.perl2
-rw-r--r--convert.c38
-rw-r--r--convert.h17
-rw-r--r--diff.c54
-rw-r--r--diff.h13
-rw-r--r--diffcore-pickaxe.c48
-rw-r--r--environment.c4
-rw-r--r--fetch-object.c45
-rw-r--r--fetch-object.h11
-rw-r--r--fetch-pack.c65
-rw-r--r--fetch-pack.h10
-rwxr-xr-xgit-add--interactive.perl2
-rwxr-xr-xgit-send-email.perl5
-rwxr-xr-xgit-stash.sh5
-rwxr-xr-xgit-submodule.sh112
-rwxr-xr-xgit-svn.perl1
-rw-r--r--hashmap.h3
-rw-r--r--http-walker.c6
-rw-r--r--http.c16
-rw-r--r--list-objects-filter-options.c92
-rw-r--r--list-objects-filter-options.h18
-rw-r--r--list-objects.c29
-rw-r--r--merge-recursive.c17
-rw-r--r--mru.c50
-rw-r--r--mru.h45
-rw-r--r--object.c13
-rw-r--r--object.h5
-rw-r--r--oidmap.c11
-rw-r--r--pack-revindex.c6
-rw-r--r--packfile.c98
-rw-r--r--packfile.h13
-rw-r--r--perl/.gitignore9
-rw-r--r--perl/Git.pm73
-rw-r--r--perl/Git/Error.pm46
-rw-r--r--perl/Git/FromCPAN/Error.pm (renamed from perl/private-Error.pm)0
-rw-r--r--perl/Git/FromCPAN/Mail/Address.pm276
-rw-r--r--perl/Git/I18N.pm2
-rwxr-xr-xperl/Git/Mail/Address.pm24
-rw-r--r--perl/Makefile90
-rw-r--r--perl/Makefile.PL62
-rw-r--r--quote.c30
-rw-r--r--quote.h10
-rw-r--r--ref-filter.c3
-rw-r--r--remote-curl.c20
-rw-r--r--repository.c2
-rw-r--r--revision.c43
-rw-r--r--revision.h17
-rw-r--r--run-command.c88
-rw-r--r--setup.c7
-rw-r--r--sha1_file.c85
-rw-r--r--submodule.c4
-rw-r--r--t/helper/test-run-command.c9
-rwxr-xr-xt/lib-submodule-update.sh19
-rwxr-xr-xt/perf/aggregate.perl162
-rwxr-xr-xt/perf/p7820-grep-engines.sh52
-rwxr-xr-xt/perf/p7821-grep-engines-fixed.sh55
-rwxr-xr-xt/perf/run31
-rwxr-xr-xt/t0061-run-command.sh37
-rwxr-xr-xt/t0410-partial-clone.sh343
-rwxr-xr-xt/t2203-add-intent.sh72
-rwxr-xr-xt/t3701-add-interactive.sh48
-rwxr-xr-xt/t3903-stash.sh32
-rwxr-xr-xt/t4064-diff-oidfind.sh68
-rwxr-xr-xt/t5500-fetch-pack.sh63
-rwxr-xr-xt/t5600-clone-fail-cleanup.sh100
-rwxr-xr-xt/t5601-clone.sh118
-rwxr-xr-xt/t5616-partial-clone.sh146
-rwxr-xr-xt/t6037-merge-ours-theirs.sh32
-rwxr-xr-xt/t6120-describe.sh6
-rwxr-xr-xt/t7500-commit.sh9
-rwxr-xr-xt/t9000-addresses.sh27
-rwxr-xr-xt/t9000/test.pl67
-rwxr-xr-xt/t9001-send-email.sh36
-rw-r--r--t/test-lib.sh2
-rw-r--r--trace.c9
-rw-r--r--transport-helper.c5
-rw-r--r--transport.c12
-rw-r--r--transport.h16
-rw-r--r--unpack-trees.c25
-rw-r--r--upload-pack.c31
-rw-r--r--wrap-for-bin.sh2
-rw-r--r--wt-status.c83
-rw-r--r--wt-status.h5
130 files changed, 3681 insertions, 1150 deletions
diff --git a/Documentation/RelNotes/2.16.1.txt b/Documentation/RelNotes/2.16.1.txt
new file mode 100644
index 0000000000..66e64361fd
--- /dev/null
+++ b/Documentation/RelNotes/2.16.1.txt
@@ -0,0 +1,11 @@
+Git v2.16.1 Release Notes
+=========================
+
+Fixes since v2.16
+-----------------
+
+ * "git clone" segfaulted when cloning a project that happens to
+ track two paths that differ only in case on a case insensitive
+ filesystem.
+
+Does not contain any other documentation updates or code clean-ups.
diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.txt
new file mode 100644
index 0000000000..759e75fbde
--- /dev/null
+++ b/Documentation/RelNotes/2.17.0.txt
@@ -0,0 +1,84 @@
+Git 2.17 Release Notes
+======================
+
+Updates since v2.16
+-------------------
<