Skip to content

Commit

Permalink
Sync with v2.0.3
Browse files Browse the repository at this point in the history
* maint:
  Git 2.0.3
  .mailmap: combine Stefan Beller's emails
  git.1: switch homepage for stats
  • Loading branch information
gitster committed Jul 23, 2014
2 parents 6da748a + 740c281 commit 996b0fd
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
17 changes: 17 additions & 0 deletions Documentation/RelNotes/2.0.3.txt
Original file line number Diff line number Diff line change
@@ -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.
5 changes: 3 additions & 2 deletions Documentation/git.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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].
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 996b0fd

Please sign in to comment.