From 405869d0d5e5c943af08c0a0b32989843b001b66 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 23 Jul 2014 14:32:09 +0200 Subject: git.1: switch homepage for stats According to http://meta.ohloh.net/2014/07/black-duck-open-hub/ the site name of ohloh changed to openhub. Change the man page accordingly. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano diff --git a/Documentation/git.txt b/Documentation/git.txt index 9d0883d..5a98d3f 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -1044,7 +1044,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 -. http://www.ohloh.net/p/git/contributors/summary +. 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 -- cgit v0.10.2-6-g49f6 From 98b12a4b9ab319be5bd3dcd003069e8720b8e7a5 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Wed, 23 Jul 2014 14:32:10 +0200 Subject: .mailmap: combine Stefan Beller's emails Google mail has had the extension @googlemail.com for a long time in Germany as @gmail.de was already taken by a competitor. Nowadays the original gmail company isn't there anymore(?), hence Googlemail also introduced @gmail.com in Germany, which I switched to. This changed mail address of mine first appeared in 398dd4bd039680b (2014-07-10, .mailmap: map different names with the same email address together) ironically. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano diff --git a/.mailmap b/.mailmap index 11057cb..d0734d1 100644 --- a/.mailmap +++ b/.mailmap @@ -202,6 +202,7 @@ Seth Falcon Shawn O. Pearce Simon Hausmann Simon Hausmann +Stefan Beller Stefan Naewe Stefan Naewe Stefan Sperling -- cgit v0.10.2-6-g49f6 From 740c281d21ef5b27f6f1b942a4f2fc20f51e8c7e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 23 Jul 2014 11:33:16 -0700 Subject: Git 2.0.3 Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes/2.0.3.txt b/Documentation/RelNotes/2.0.3.txt new file mode 100644 index 0000000..4047b46 --- /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 5a98d3f..f95911a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,9 +43,10 @@ unreleased) version of Git, that is available from '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]. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index b14f852..0d1a86c 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.0.2 +DEF_VER=v2.0.3 LF=' ' diff --git a/RelNotes b/RelNotes index 7c4ae86..84ad4af 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.0.2.txt \ No newline at end of file +Documentation/RelNotes/2.0.3.txt \ No newline at end of file -- cgit v0.10.2-6-g49f6