summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/RelNotes/2.11.1.txt120
-rw-r--r--Documentation/RelNotes/2.12.0.txt111
-rw-r--r--Documentation/config.txt79
-rw-r--r--Documentation/diff-config.txt6
-rw-r--r--Documentation/diff-heuristic-options.txt2
-rw-r--r--Documentation/git-fetch-pack.txt6
-rw-r--r--Documentation/git-fetch.txt2
-rw-r--r--Documentation/git-gc.txt34
-rw-r--r--Documentation/git-grep.txt14
-rw-r--r--Documentation/git-merge.txt8
-rw-r--r--Documentation/git-p4.txt2
-rw-r--r--Documentation/git-pull.txt2
-rw-r--r--Documentation/git-push.txt2
-rw-r--r--Documentation/git-shortlog.txt4
-rw-r--r--Documentation/git-submodule.txt15
-rw-r--r--Documentation/git.txt41
-rw-r--r--Documentation/gitattributes.txt4
-rw-r--r--Documentation/gitnamespaces.txt20
-rw-r--r--Documentation/technical/api-submodule-config.txt14
-rw-r--r--Documentation/transfer-data-leaks.txt30
-rw-r--r--Makefile3
-rw-r--r--abspath.c227
-rw-r--r--archive-zip.c7
-rw-r--r--builtin/blame.c32
-rw-r--r--builtin/clean.c10
-rw-r--r--builtin/fetch.c3
-rw-r--r--builtin/gc.c9
-rw-r--r--builtin/grep.c386
-rw-r--r--builtin/init-db.c6
-rw-r--r--builtin/merge.c25
-rw-r--r--builtin/pack-objects.c14
-rw-r--r--builtin/push.c7
-rw-r--r--builtin/repack.c9
-rw-r--r--builtin/rm.c84
-rw-r--r--builtin/shortlog.c15
-rw-r--r--builtin/submodule--helper.c69
-rw-r--r--bulk-checkin.c2
-rw-r--r--cache.h10
-rw-r--r--compat/winansi.c202
-rw-r--r--config.c58
-rw-r--r--contrib/completion/git-completion.bash2
-rwxr-xr-xcontrib/long-running-filter/example.pl8
-rw-r--r--diff.c23
-rw-r--r--dir.c37
-rw-r--r--dir.h4
-rw-r--r--environment.c4
-rw-r--r--fast-import.c21
-rwxr-xr-xgit-add--interactive.perl332
-rwxr-xr-xgit-difftool.perl73
-rwxr-xr-xgit-p4.py38
-rw-r--r--git-rebase--interactive.sh5
-rwxr-xr-xgit-send-email.perl191
-rw-r--r--git-sh-setup.sh4
-rwxr-xr-xgit-submodule.sh19
-rw-r--r--git.c4
-rw-r--r--gitk-git/Makefile1
-rwxr-xr-xgitk-git/gitk166
-rw-r--r--gitk-git/po/bg.po4
-rw-r--r--gitk-git/po/ca.po6
-rw-r--r--gitk-git/po/de.po4
-rw-r--r--gitk-git/po/es.po4
-rw-r--r--gitk-git/po/fr.po4
-rw-r--r--gitk-git/po/hu.po4
-rw-r--r--gitk-git/po/it.po4
-rw-r--r--gitk-git/po/ja.po13
-rw-r--r--gitk-git/po/pt_br.po4
-rw-r--r--gitk-git/po/pt_pt.po1376
-rw-r--r--gitk-git/po/ru.po670
-rw-r--r--gitk-git/po/sv.po19
-rw-r--r--gitk-git/po/vi.po4
-rw-r--r--grep.c16
-rw-r--r--grep.h1
-rw-r--r--http-walker.c52
-rw-r--r--http.c35
-rw-r--r--lockfile.h2
-rw-r--r--perl/Git.pm38
-rw-r--r--perl/Git/I18N.pm19
-rw-r--r--read-cache.c9
-rw-r--r--remote-curl.c8
-rw-r--r--remote.c6
-rw-r--r--setup.c13
-rw-r--r--sha1_file.c48
-rw-r--r--shortlog.h1
-rw-r--r--submodule-config.c58
-rw-r--r--submodule-config.h7
-rw-r--r--submodule.c237
-rw-r--r--submodule.h64
-rw-r--r--t/lib-proto-disable.sh142
-rwxr-xr-xt/t0021-conversion.sh33
-rw-r--r--t/t0021/rot13-filter.pl8
-rwxr-xr-xt/t0202/test.pl14
-rwxr-xr-xt/t1050-large.sh29
-rwxr-xr-xt/t1514-rev-parse-push.sh6
-rwxr-xr-xt/t3600-rm.sh39
-rwxr-xr-xt/t4201-shortlog.sh19
-rwxr-xr-xt/t5003-archive-zip.sh22
-rwxr-xr-xt/t5310-pack-bitmaps.sh8
-rwxr-xr-xt/t5315-pack-objects-compression.sh44
-rwxr-xr-xt/t5509-fetch-push-namespaces.sh1
-rwxr-xr-xt/t5528-push-default.sh10
-rwxr-xr-xt/t5550-http-fetch-dumb.sh10
-rwxr-xr-xt/t5551-http-fetch-smart.sh52
-rwxr-xr-xt/t5802-connect-helper.sh1
-rwxr-xr-xt/t5812-proto-disable-http.sh7
-rwxr-xr-xt/t6500-gc.sh25
-rwxr-xr-xt/t7411-submodule-config.sh14
-rwxr-xr-xt/t7412-submodule-absorbgitdirs.sh101
-rwxr-xr-xt/t7600-merge.sh11
-rwxr-xr-xt/t7814-grep-recurse-submodules.sh241
-rwxr-xr-xt/t8002-blame.sh32
-rwxr-xr-xt/t8011-blame-split-file.sh117
-rwxr-xr-xt/t9301-fast-import-notes.sh42
-rwxr-xr-xt/t9303-fast-import-compression.sh67
-rwxr-xr-xt/t9800-git-p4-basic.sh22
-rwxr-xr-xt/t9824-git-p4-git-lfs.sh24
-rwxr-xr-xt/t9830-git-p4-symlink-dir.sh43
-rw-r--r--t/test-lib-functions.sh20
-rw-r--r--transport.c86
-rw-r--r--transport.h19
-rw-r--r--tree-walk.c28
-rw-r--r--upload-pack.c10
-rw-r--r--utf8.c36
-rw-r--r--worktree.c52
-rw-r--r--worktree.h5
-rw-r--r--xdiff/xdiff.h3
-rw-r--r--xdiff/xdiffi.c33
126 files changed, 5361 insertions, 1471 deletions
diff --git a/Documentation/RelNotes/2.11.1.txt b/Documentation/RelNotes/2.11.1.txt
new file mode 100644
index 0000000000..74b193f1a8
--- /dev/null
+++ b/Documentation/RelNotes/2.11.1.txt
@@ -0,0 +1,120 @@
+Git v2.11.1 Release Notes
+=========================
+
+Fixes since v2.11
+-----------------
+
+ * The default Travis-CI configuration specifies newer P4 and GitLFS.
+
+ * The character width table has been updated to match Unicode 9.0
+
+ * Update the isatty() emulation for Windows by updating the previous
+ hack that depended on internals of (older) MSVC runtime.
+
+ * "git rev-parse --symbolic" failed with a more recent notation like
+ "HEAD^-1" and "HEAD^!".
+
+ * An empty directory in a working tree that can simply be nuked used
+ to interfere while merging or cherry-picking a change to create a
+ submodule directory there, which has been fixed..
+
+ * The code in "git push" to compute if any commit being pushed in the
+ superproject binds a commit in a submodule that hasn't been pushed
+ out was overly inefficient, making it unusable even for a small
+ project that does not have any submodule but have a reasonable
+ number of refs.
+
+ * "git push --dry-run --recurse-submodule=on-demand" wasn't
+ "--dry-run" in the submodules.
+
+ * The output from "git worktree list" was made in readdir() order,
+ and was unstable.
+
+ * mergetool.<tool>.trustExitCode configuration variable did not apply
+ to built-in tools, but now it does.
+
+ * "git p4" LFS support was broken when LFS stores an empty blob.
+
+ * Fix a corner case in merge-recursive regression that crept in
+ during 2.10 development cycle.
+
+ * Update the error messages from the dumb-http client when it fails
+ to obtain loose objects; we used to give sensible error message
+ only upon 404 but we now forbid unexpected redirects that needs to
+ be repor