From 2bafb4aa678790ade2e1569c41a4eed73de7dea6 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 23 Oct 2017 10:15:51 -0700 Subject: [PATCH] debian: new upstream release candidate Signed-off-by: Jonathan Nieder --- debian/changelog | 6 ++++++ debian/changelog.upstream | 30 ++++++++++++++++++++++++++++++ debian/versions.upstream | 1 + 3 files changed, 37 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4a57e4ed32..09dd3806f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git (1:2.15.0~rc2-1) unstable; urgency=low + + * new upstream release candidate. + + -- Jonathan Nieder Mon, 23 Oct 2017 10:15:45 -0700 + git (1:2.15.0~rc1-1) unstable; urgency=low * new upstream release candidate. diff --git a/debian/changelog.upstream b/debian/changelog.upstream index e9509560f2..1452755ebe 100644 --- a/debian/changelog.upstream +++ b/debian/changelog.upstream @@ -1,3 +1,33 @@ +Version v2.15.0-rc2; changes since v2.15.0-rc1: +----------------------------------------------- + +David Glasser (1): + doc: list filter-branch subdirectory-filter first + +Jeff King (5): + diff: fix infinite loop with --color-moved --ignore-space-change + Revert "color: make "always" the same as "auto" in config" + Revert "t6006: drop "always" color config tests" + Revert "color: check color.ui in git_default_config()" + tag: respect color.ui config + +Junio C Hamano (7): + checkout doc: clarify command line args for "checkout paths" mode + Crawling towards -rc2 + fetch doc: src side of refspec could be full SHA-1 + Preparing for rc2 continues + branch doc: sprinkle a few commas for readability + Prepare for 2.14.3 + Git 2.15-rc2 + +Ralf Thielow (2): + sequencer.c: fix and unify error messages in rearrange_squash() + sequencer.c: unify an error message + +W. Trevor King (1): + Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull' + + Version v2.15.0-rc1; changes since v2.15.0-rc0: ----------------------------------------------- diff --git a/debian/versions.upstream b/debian/versions.upstream index 6a1423dc03..131c91bfc4 100644 --- a/debian/versions.upstream +++ b/debian/versions.upstream @@ -595,3 +595,4 @@ v2.14.1 v2.14.2 v2.15.0-rc0 v2.15.0-rc1 +v2.15.0-rc2 -- 2.11.4.GIT