From 8c7a786b6c8eae8eac91083cdc9a6e337bc133b0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 21 Oct 2012 13:56:23 -0700 Subject: [PATCH] Git 1.8.0 Signed-off-by: Junio C Hamano --- Documentation/RelNotes/1.8.0.txt | 22 +++++++++++++--------- Documentation/git.txt | 5 +++++ GIT-VERSION-GEN | 2 +- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt index 04f6ace82882d2..43883c14f08ac0 100644 --- a/Documentation/RelNotes/1.8.0.txt +++ b/Documentation/RelNotes/1.8.0.txt @@ -4,16 +4,18 @@ Git v1.8.0 Release Notes Backward compatibility notes ---------------------------- -In the next major release, we will change the behavior of the "git -push" command. When "git push [$there]" does not say what to push, we -have used the traditional "matching" semantics so far (all your branches were -sent to the remote as long as there already are branches of the same -name over there). We will now use the "simple" semantics, that pushes the -current branch to the branch with the same name only when the current +In the next major release (not *this* one), we will change the +behavior of the "git push" command. + +When "git push [$there]" does not say what to push, we have used the +traditional "matching" semantics so far (all your branches were sent +to the remote as long as there already are branches of the same name +over there). We will use the "simple" semantics that pushes the +current branch to the branch with the same name, only when the current branch is set to integrate with that remote branch. There is a user preference configuration variable "push.default" to change this, and "git push" will warn about the upcoming change until you set this -variable. +variable in this release. "git branch --set-upstream" is deprecated and may be removed in a relatively distant future. "git branch [-u|--set-upstream-to]" has @@ -35,7 +37,7 @@ UI, Workflows & Features * When "git am" sanitizes the "Subject:" line, we strip the prefix from "Re: subject" and also from a less common "re: subject", but left - the even less common "RE: subject" intact. We strip that now, too. + the even less common "RE: subject" intact. Now we strip that too. * It was tempting to say "git branch --set-upstream origin/master", but that tells Git to arrange the local branch "origin/master" to @@ -62,6 +64,8 @@ UI, Workflows & Features * "git grep" learned to use a non-standard pattern type by default if a configuration variable tells it to. + * Accumulated updates to "git gui" has been merged. + * "git log -g" learned the "--grep-reflog=" option to limit its output to commits with a reflog message that matches the given pattern. @@ -85,7 +89,7 @@ Foreign Interface encountering a conflict during "p4 submit". -Performance, Internal Implementation, etc. (please report possible regressions) +Performance, Internal Implementation, etc. * Git ships with a fall-back regexp implementation for platforms with buggy regexp library, but it was easy for people to keep using their diff --git a/Documentation/git.txt b/Documentation/git.txt index fbdd2a5a6a6fb5..4a89a1251366ab 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,6 +43,11 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: +* link:v1.8.0/git.html[documentation for release 1.8.0] + +* release notes for + link:RelNotes/1.8.0.txt[1.8.0], + * link:v1.7.12.4/git.html[documentation for release 1.7.12.4] * release notes for diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 27b490c6910293..b09d264a865fc6 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.0-rc3 +DEF_VER=v1.8.0 LF=' '