diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-23 11:36:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-23 11:36:40 -0700 |
| commit | 996b0fdbb4ff63bfd880b3901f054139c95611cf (patch) | |
| tree | e760f781f2c997fd1d26f2779ac00d42ca93f534 | |
| parent | 6da748a7cebe3911448fabf9426f81c9df9ec54f (diff) | |
| parent | 740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e (diff) | |
| download | git-996b0fdbb4ff63bfd880b3901f054139c95611cf.tar.gz | |
Sync with v2.0.3
* maint:
Git 2.0.3
.mailmap: combine Stefan Beller's emails
git.1: switch homepage for stats
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | Documentation/RelNotes/2.0.3.txt | 17 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 |
3 files changed, 21 insertions, 2 deletions
@@ -204,6 +204,7 @@ Seth Falcon <seth@userprimary.net> <sfalcon@fhcrc.org> Shawn O. Pearce <spearce@spearce.org> Simon Hausmann <hausmann@kde.org> <simon@lst.de> Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com> +Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com> Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com> Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com> Stefan Sperling <stsp@elego.de> <stsp@stsp.name> diff --git a/Documentation/RelNotes/2.0.3.txt b/Documentation/RelNotes/2.0.3.txt new file mode 100644 index 0000000000..4047b46bbe --- /dev/null +++ b/Documentation/RelNotes/2.0.3.txt @@ -0,0 +1,17 @@ +Git v2.0.3 Release Notes +======================== + + * An ancient rewrite passed a wrong pointer to a curl library + function in a rarely used code path. + + * "filter-branch" left an empty single-parent commit that results when + all parents of a merge commit gets mapped to the same commit, even + under "--prune-empty". + + * "log --show-signature" incorrectly decided the color to paint a + mergetag that was and was not correctly validated. + + * "log --show-signature" did not pay attention to "--graph" option. + +Also a lot of fixes to the tests and some updates to the docs are +included. diff --git a/Documentation/git.txt b/Documentation/git.txt index 05857c96ff..a0f1ede866 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v2.0.2/git.html[documentation for release 2.0.2] +* link:v2.0.3/git.html[documentation for release 2.0.3] * release notes for + link:RelNotes/2.0.3.txt[2.0.3], link:RelNotes/2.0.2.txt[2.0.2], link:RelNotes/2.0.1.txt[2.0.1], link:RelNotes/2.0.0.txt[2.0.0]. @@ -1067,7 +1068,7 @@ Authors ------- Git was started by Linus Torvalds, and is currently maintained by Junio C Hamano. Numerous contributions have come from the Git mailing list -<git@vger.kernel.org>. http://www.ohloh.net/p/git/contributors/summary +<git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a more complete list of contributors. If you have a clone of git.git itself, the |