summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-07-23 11:36:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-07-23 11:36:40 -0700
commit996b0fdbb4ff63bfd880b3901f054139c95611cf (patch)
treee760f781f2c997fd1d26f2779ac00d42ca93f534 /Documentation
parentMerge branch 'rs/fix-unlink-unix-socket' (diff)
parentGit 2.0.3 (diff)
downloadtgif-996b0fdbb4ff63bfd880b3901f054139c95611cf.tar.xz
Sync with v2.0.3
* maint: Git 2.0.3 .mailmap: combine Stefan Beller's emails git.1: switch homepage for stats
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/RelNotes/2.0.3.txt17
-rw-r--r--Documentation/git.txt5
2 files changed, 20 insertions, 2 deletions
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