From 6641575963388b61f408f177d91cdacad25d2e26 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 29 Jul 2009 09:33:29 -0700 Subject: Start 1.6.5 cycle The next major release will be 1.6.5, hopefully with a shorter cycle than the 1.6.4 cycle. After that in 1.7.0 we can make potentially backward incompatible changes if necessary. Signed-off-by: Junio C Hamano --- RelNotes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'RelNotes') diff --git a/RelNotes b/RelNotes index f8e49a5070..b62449d2e2 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.4.txt \ No newline at end of file +Documentation/RelNotes-1.6.5.txt \ No newline at end of file -- cgit v1.2.3 From ad12b81271d76f3e4a8b1f527e252ac8452732fd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 17 Oct 2009 00:11:43 -0700 Subject: Start 1.6.6 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.6.txt | 60 ++++++++++++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.6.6.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.6.6.txt b/Documentation/RelNotes-1.6.6.txt new file mode 100644 index 0000000000..5f1fecb5ec --- /dev/null +++ b/Documentation/RelNotes-1.6.6.txt @@ -0,0 +1,60 @@ +GIT v1.6.6 Release Notes +======================== + +In git 1.7.0, which is planned to be the release after 1.6.6, "git +push" into a branch that is currently checked out will be refused by +default. + +You can choose what should happen upon such a push by setting the +configuration variable receive.denyCurrentBranch in the receiving +repository. + +Also, "git push $there :$killed" to delete the branch $killed in a remote +repository $there, when $killed branch is the current branch pointed at by +its HEAD, will be refused by default. + +You can choose what should happen upon such a push by setting the +configuration variable receive.denyDeleteCurrent in the receiving +repository. + +To ease the transition plan, the receiving repository of such a +push running this release will issue a big warning when the +configuration variable is missing. Please refer to: + + http://git.or.cz/gitwiki/GitFaq#non-bare + http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007 + +for more details on the reason why this change is needed and the +transition plan. + +Updates since v1.6.5 +-------------------- + +(subsystems) + +(portability) + +(performance) + +(usability, bells and whistles) + + * "git log --decorate" shows the location of HEAD as well. + +(developers) + +Fixes since v1.6.5 +------------------ + +All of the fixes in v1.6.5.X maintenance series are included in this +release, unless otherwise noted. + + * "git apply" and "git diff" (including patch output from "git log -p") + now flags trailing blank lines as whitespace errors correctly (only + "apply --whitespace=fix" stripped them but "apply --whitespace=warn" + did not even warn). + + * Two whitespace error classes, 'blank-at-eof' and 'blank-at-eol', have + been introduced (settable by core.whitespace configuration variable and + whitespace attribute). The 'trailing-space' whitespace error class has + become a short-hand to cover both of these and there is no behaviour + change for existing set-ups. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 08e6073f33..710d361233 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.5 +DEF_VER=v1.6.5.GIT LF=' ' diff --git a/RelNotes b/RelNotes index b62449d2e2..5274ceed4e 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.5.txt \ No newline at end of file +Documentation/RelNotes-1.6.6.txt \ No newline at end of file -- cgit v1.2.3 From 68b890a8d5aab897f392928105596de85cc9135e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 26 Dec 2009 14:11:46 -0800 Subject: Kick off 1.7.0 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.0.txt | 64 ++++++++++++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.7.0.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt new file mode 100644 index 0000000000..d519d0612f --- /dev/null +++ b/Documentation/RelNotes-1.7.0.txt @@ -0,0 +1,64 @@ +Git v1.7.0 Release Notes +======================== + +Notes on behaviour change +------------------------- + + * "git push" into a branch that is currently checked out (i.e. pointed by + HEAD in a repository that is not bare) is refused by default. + + Similarly, "git push $there :$killed" to delete the branch $killed + in a remote repository $there, when $killed branch is the current + branch pointed at by its HEAD, will be refused by default. + + Setting the configuration variables receive.denyCurrentBranch and + receive.denyDeleteCurrent to 'ignore' in the receiving repository + can be used to override these safety features. + + * "git send-email" does not make deep threads by default when sending a + patch series with more than two messages. All messages will be sent + as a reply to the first message, i.e. cover letter. + + It has been possible to configure send-email to send "shallow thread" + by setting sendemail.chainreplyto configuration variable to false. The + only thing this release does is to change the default when you haven't + configured that variable. + + * "git status" is not "git commit --dry-run" anymore. This change does + not affect you if you run the command without pathspec. + + * "git diff" traditionally treated various "ignore whitespace" options + only as a way to filter the patch output. "git diff --exit-code -b" + exited with non-zero status even if all changes were about changing the + ammount of whitespace and nothing else. and "git diff -b" showed the + "diff --git" header line for such a change without patch text. + + In this release, the "ignore whitespaces" options affect the semantics + of the diff operation. A change that does not affect anything but + whitespaces is reported with zero exit status when run with + --exit-code, and there is no "diff --git" header for such a change. + + +Updates since v1.6.6 +-------------------- + +(subsystems) + +(portability) + +(performance) + +(usability, bells and whistles) + + +Fixes since v1.6.6 +------------------ + +All of the fixes in v1.6.6.X maintenance series are included in this +release, unless otherwise noted. + +-- +exec >/var/tmp/1 +O=v1.6.6-27-g648f407 +echo O=$(git describe master) +git shortlog --no-merges $O..master ^maint diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 1628d986fe..a7d8c63427 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.6 +DEF_VER=v1.6.6.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 5274ceed4e..7b9bde663b 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.6.txt \ No newline at end of file +Documentation/RelNotes-1.7.0.txt \ No newline at end of file -- cgit v1.2.3 From 318721e3acd8f9c06fde0d528b7547a99f65c4a1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 13 Feb 2010 15:01:37 -0800 Subject: Start 1.7.1 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 17 +++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.7.1.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt new file mode 100644 index 0000000000..b0bf8366c0 --- /dev/null +++ b/Documentation/RelNotes-1.7.1.txt @@ -0,0 +1,17 @@ +Git v1.7.1 Release Notes +======================== + +Updates since v1.7.0 +-------------------- + +Fixes since v1.7.0 +------------------ + +All of the fixes in v1.7.0.X maintenance series are included in this +release, unless otherwise noted. + +--- +exec >/var/tmp/1 +echo O=$(git describe) +O=v1.7.0 +git shortlog --no-merges ^maint $O.. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 577e1fd20e..a668143d7a 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.0 +DEF_VER=v1.7.0.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 7b9bde663b..00e77229dd 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.7.0.txt \ No newline at end of file +Documentation/RelNotes-1.7.1.txt \ No newline at end of file -- cgit v1.2.3 From 212f0ba357cde43d1cf66692f73a2f662d13ac55 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 8 May 2010 22:58:36 -0700 Subject: Start 1.7.2 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.2.txt | 40 ++++++++++++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.7.2.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.7.2.txt b/Documentation/RelNotes-1.7.2.txt new file mode 100644 index 0000000000..37781b4f14 --- /dev/null +++ b/Documentation/RelNotes-1.7.2.txt @@ -0,0 +1,40 @@ +Git v1.7.2 Release Notes (draft) +================================ + +Updates since v1.7.1 +-------------------- + + * After "git apply --whitespace=fix" removed trailing blank lines in an + patch in a patch series, it failed to apply later patches that depend + on the presense of such blank lines. + + * The output from the textconv filter used by "git diff" can be cached to + speed up their reuse. + + * "git send-email" learned --smtp-domain option to specify the domainname + used in the EHLO/HELO exchange. + + * "git revert" learned --strategy option to specify the merge strategy. + + * The whitespace rules used in "git apply --whitespace" and "git diff" + gained a new member in the family (tab-in-indent) to help projects with + policy to indent only with spaces. + + * Authentication over http transport can now be made lazily, in that the + request can first go to a URL without username, get a 401 response and + then the client will ask for the username to use. + + +Fixes since v1.7.1 +------------------ + + * In 1.7.1, "git status" stopped refreshing the index by mistake. + +All of the fixes in v1.7.1.X maintenance series are included in this +release, unless otherwise noted. + +-- +exec >/var/tmp/1 +O=v1.7.1-77-gb751157 +echo O=$(git describe master) +git shortlog --no-merges master ^maint ^$O diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 0ad39484ec..59219bd6a5 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.1 +DEF_VER=v1.7.1.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 00e77229dd..3da01a5622 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.7.1.txt \ No newline at end of file +Documentation/RelNotes-1.7.2.txt \ No newline at end of file -- cgit v1.2.3