summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitattributes2
-rw-r--r--.mailmap13
-rw-r--r--.travis.yml2
-rw-r--r--Documentation/RelNotes/2.20.0.txt66
-rw-r--r--Documentation/config.txt7
-rw-r--r--Documentation/config/rebase.txt14
-rw-r--r--Documentation/git-range-diff.txt17
-rw-r--r--Documentation/gitrepository-layout.txt2
-rw-r--r--Documentation/technical/api-parse-options.txt4
-rw-r--r--Documentation/technical/repository-version.txt26
-rwxr-xr-xGIT-VERSION-GEN2
-rw-r--r--Makefile48
-rw-r--r--apply.c26
-rw-r--r--archive-tar.c2
-rw-r--r--attr.c14
-rw-r--r--builtin/am.c4
-rw-r--r--builtin/blame.c4
-rw-r--r--builtin/cat-file.c14
-rw-r--r--builtin/checkout-index.c2
-rw-r--r--builtin/clean.c1
-rw-r--r--builtin/commit.c5
-rw-r--r--builtin/fast-export.c2
-rw-r--r--builtin/fetch.c2
-rw-r--r--builtin/grep.c93
-rw-r--r--builtin/index-pack.c72
-rw-r--r--builtin/init-db.c1
-rw-r--r--builtin/interpret-trailers.c2
-rw-r--r--builtin/log.c14
-rw-r--r--builtin/ls-files.c14
-rw-r--r--builtin/ls-tree.c2
-rw-r--r--builtin/merge-file.c2
-rw-r--r--builtin/merge.c31
-rw-r--r--builtin/notes.c11
-rw-r--r--builtin/pack-objects.c49
-rw-r--r--builtin/pull.c11
-rw-r--r--builtin/read-tree.c3
-rw-r--r--builtin/rebase.c204
-rw-r--r--builtin/show-branch.c3
-rw-r--r--builtin/show-ref.c1
-rw-r--r--builtin/tag.c6
-rw-r--r--builtin/update-index.c21
-rw-r--r--bundle.c39
-rwxr-xr-xci/lib-travisci.sh4
-rw-r--r--commit.c35
-rw-r--r--commit.h15
-rw-r--r--compat/mingw.c18
-rw-r--r--compat/win32/pthread.c138
-rw-r--r--compat/win32/pthread.h28
-rw-r--r--config.c2
-rw-r--r--config.mak.uname3
-rw-r--r--configure.ac17
-rw-r--r--diff.c2
-rw-r--r--fast-import.c4
-rw-r--r--gettext.c11
-rw-r--r--gettext.h9
-rw-r--r--git-sh-i18n.sh2
-rw-r--r--grep.c6
-rw-r--r--grep.h6
-rw-r--r--http-push.c2
-rw-r--r--midx.c12
-rw-r--r--name-hash.c38
-rw-r--r--object.h4
-rw-r--r--pack-objects.h6
-rw-r--r--parse-options-cb.c14
-rw-r--r--parse-options.h18
-rw-r--r--po/README13
-rw-r--r--preload-index.c23
-rw-r--r--prio-queue.c9
-rw-r--r--prio-queue.h6
-rw-r--r--range-diff.c3
-rw-r--r--read-cache.c37
-rw-r--r--ref-filter.c8
-rw-r--r--refs.c4
-rw-r--r--remote-curl.c7
-rw-r--r--revision.c243
-rw-r--r--revision.h7
-rw-r--r--run-command.c11
-rw-r--r--run-command.h5
-rw-r--r--send-pack.c5
-rw-r--r--sequencer.c10
-rw-r--r--sha1-file.c6
-rw-r--r--t/README10
-rw-r--r--t/helper/test-parse-options.c2
-rw-r--r--t/helper/test-prio-queue.c26
-rw-r--r--t/lib-gettext.sh2
-rw-r--r--t/lib-gpg/keyring.gpg62
-rwxr-xr-xt/perf/p3400-rebase.sh10
-rwxr-xr-xt/t0000-basic.sh2
-rwxr-xr-xt/t0009-prio-queue.sh14
-rwxr-xr-xt/t0040-parse-options.sh22
-rwxr-xr-xt/t0205-gettext-poison.sh8
-rwxr-xr-xt/t3206-range-diff.sh30
-rwxr-xr-xt/t3406-rebase-message.sh9
-rwxr-xr-xt/t3420-rebase-autostash.sh8
-rwxr-xr-xt/t3430-rebase-merges.sh16
-rwxr-xr-xt/t4052-stat-output.sh48
-rwxr-xr-xt/t4136-apply-check.sh12
-rwxr-xr-xt/t5512-ls-remote.sh6
-rwxr-xr-xt/t5573-pull-verify-signatures.sh7
-rwxr-xr-xt/t5607-clone-bundle.sh6
-rwxr-xr-xt/t6012-rev-list-simplify.sh45
-rwxr-xr-xt/t6018-rev-list-glob.sh60
-rwxr-xr-xt/t6600-test-reach.sh96
-rwxr-xr-xt/t7201-co.sh6
-rwxr-xr-xt/t7510-signed-commit.sh22
-rwxr-xr-xt/t7612-merge-verify-signatures.sh7
-rwxr-xr-xt/t9902-completion.sh3
-rw-r--r--t/test-lib-functions.sh8
-rw-r--r--t/test-lib.sh22
-rw-r--r--thread-utils.c48
-rw-r--r--thread-utils.h48
-rw-r--r--wt-status.c9
112 files changed, 1496 insertions, 827 deletions
diff --git a/.gitattributes b/.gitattributes
index 49b3051641..acf853e029 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -5,7 +5,7 @@
*.pl eof=lf diff=perl
*.pm eol=lf diff=perl
*.py eol=lf diff=python
-/Documentation/git-*.txt eol=lf
+/Documentation/**/*.txt eol=lf
/command-list.txt eol=lf
/GIT-VERSION-GEN eol=lf
/mergetools/* eol=lf
diff --git a/.mailmap b/.mailmap
index bef3352b0d..eb7b5fc7b9 100644
--- a/.mailmap
+++ b/.mailmap
@@ -21,6 +21,8 @@ Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
Aneesh Kumar K.V <aneesh.kumar@gmail.com>
Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
Amos Waterland <apw@debian.org> <apw@us.ibm.com>
+Ben Peart <benpeart@microsoft.com> <Ben.Peart@microsoft.com>
+Ben Peart <benpeart@microsoft.com> <peartben@gmail.com>
Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
@@ -32,6 +34,7 @@ Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
Cheng Renquan <crquan@gmail.com>
Chris Shoemaker <c.shoemaker@cox.net>
Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
+Christian Ludwig <chrissicool@gmail.com> <chrissicool@googlemail.com>
Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
@@ -51,6 +54,7 @@ David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
David S. Miller <davem@davemloft.net>
David Turner <novalis@novalis.org> <dturner@twopensource.com>
David Turner <novalis@novalis.org> <dturner@twosigma.com>
+Derrick Stolee <dstolee@microsoft.com> <stolee@gmail.com>
Deskin Miller <deskinm@umich.edu>
Dirk Süsserott <newsletter@dirk.my1.cc>
Eric Blake <eblake@redhat.com> <ebb9@byu.net>
@@ -98,6 +102,7 @@ Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
Jens Lindström <jl@opera.com> Jens Lindstrom <jl@opera.com>
Jim Meyering <jim@meyering.net> <meyering@redhat.com>
Joachim Berdal Haga <cjhaga@fys.uio.no>
+Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com>
Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
@@ -150,6 +155,7 @@ Mark Levedahl <mdl123@verizon.net> <mlevedahl@gmail.com>
Mark Rada <marada@uwaterloo.ca>
Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
+Masaya Suzuki <masayasuzuki@google.com> <draftcode@gmail.com>
Matt Draisey <matt@draisey.ca> <mattdraisey@sympatico.ca>
Matt Kraai <kraai@ftbfs.org> <matt.kraai@amo.abbott.com>
Matt McCutchen <matt@mattmccutchen.net> <hashproduct@gmail.com>
@@ -157,6 +163,7 @@ Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
Matthias Rüster <matthias.ruester@gmail.com> Matthias Ruester
Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
+Matthieu Moy <git@matthieu-moy.fr> <Matthieu.Moy@imag.fr>
Michael Coleman <tutufan@gmail.com>
Michael J Gruber <git@grubix.eu> <michaeljgruber+gmane@fastmail.fm>
Michael J Gruber <git@grubix.eu> <git@drmicha.warpmail.net>
@@ -180,7 +187,11 @@ Nick Stokoe <nick@noodlefactory.co.uk> Nick Woolley <nick@noodlefactory.co.uk>
Nick Stokoe <nick@noodlefactory.co.uk> Nick Woolley <nickwoolley@yahoo.co.uk>
Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nicolas.morey@free.fr>
Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nmorey@kalray.eu>
+Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nicolas@morey-chaisemartin.com>
+Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <NMoreyChaisemartin@suse.com>
+Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nmoreychaisemartin@suse.com>
Nicolas Sebrecht <nicolas.s.dev@gmx.fr> <ni.s@laposte.net>
+Orgad Shaneh <orgads@gmail.com> <orgad.shaneh@audiocodes.com>
Paolo Bonzini <bonzini@gnu.org> <paolo.bonzini@lu.unisi.ch>
Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
@@ -200,6 +211,7 @@ Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
Philippe Bruhat <book@cpan.org>
Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
+Randall S. Becker <randall.becker@nexbridge.ca> <rsbecker@nexbridge.com>
René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
René Scharfe <l.s.r@web.de> Rene Scharfe
Richard Hansen <rhansen@rhansen.org> <hansenr@google.com>
@@ -238,6 +250,7 @@ Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
SZEDER Gábor <szeder.dev@gmail.com> <szeder@ira.uka.de>
+Tao Qingyun <taoqy@ls-a.me> <845767657@qq.com>
Tay Ray Chuan <rctay89@gmail.com>
Ted Percival <ted@midg3t.net> <ted.percival@quest.com>
Theodore Ts'o <tytso@mit.edu>
diff --git a/.travis.yml b/.travis.yml
index a5a82d6832..03c8e4c613 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ compiler:
matrix:
include:
- - env: jobname=GETTEXT_POISON
+ - env: jobname=GIT_TEST_GETTEXT_POISON
os: linux
compiler:
addons:
diff --git a/Documentation/RelNotes/2.20.0.txt b/Documentation/RelNotes/2.20.0.txt
index 519c89407c..28a6863640 100644
--- a/Documentation/RelNotes/2.20.0.txt
+++ b/Documentation/RelNotes/2.20.0.txt
@@ -1,5 +1,5 @@
-Git Release Notes
-=================
+Git 2.20 Release Notes
+======================
Backward Compatibility Notes
----------------------------