From dba9194a49452b5f093b96872e19c91b50e526aa Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 17 Aug 2008 15:44:11 -0700 Subject: Start 1.6.0.X maintenance series 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 b9a53c3416..8f32997335 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.0.txt \ No newline at end of file +Documentation/RelNotes-1.6.0.1.txt \ No newline at end of file -- cgit v1.3 From 2ebc02d32a4360da2cf69c2b5f5bfad0716d42b0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 17 Aug 2008 15:48:51 -0700 Subject: Start 1.6.1 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.1.txt | 42 ++++++++++++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.6.1.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.6.1.txt b/Documentation/RelNotes-1.6.1.txt new file mode 100644 index 0000000000..efaf9ac4f7 --- /dev/null +++ b/Documentation/RelNotes-1.6.1.txt @@ -0,0 +1,42 @@ +GIT v1.6.1 Release Notes +======================== + +Updates since v1.6.0 +-------------------- + +(subsystems) + +* ... + +(portability) + +* ... + +(documentation) + +* ... + +(performance) + +* ... + +(usability, bells and whistles) + +* ... + +(internal) + +* ... + + +Fixes since v1.6.0 +------------------ + +All of the fixes in v1.6.0.X maintenance series are included in this +release, unless otherwise noted. + +-- +exec >/var/tmp/1 +O=v1.6.0 +echo O=$(git describe master) +git shortlog --no-merges $O..master ^maint diff --git a/RelNotes b/RelNotes index 8f32997335..3d420845b1 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.0.1.txt \ No newline at end of file +Documentation/RelNotes-1.6.1.txt \ No newline at end of file -- cgit v1.3 From 78f8fbc9d641096eef495dd877de3438d8a000e0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 27 Dec 2008 14:25:10 -0800 Subject: Start 1.6.2 cycle Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.2.txt | 28 ++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.6.2.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.6.2.txt b/Documentation/RelNotes-1.6.2.txt new file mode 100644 index 0000000000..1a80626781 --- /dev/null +++ b/Documentation/RelNotes-1.6.2.txt @@ -0,0 +1,28 @@ +GIT v1.6.2 Release Notes +======================== + +Updates since v1.6.1 +-------------------- + +(subsystems) + +(portability) + +(performance) + +(usability, bells and whistles) + +(internal) + + +Fixes since v1.6.1 +------------------ + +All of the fixes in v1.6.1.X maintenance series are included in this +release, unless otherwise noted. + +-- +exec >/var/tmp/1 +O=v1.6.1 +echo O=$(git describe master) +git shortlog --no-merges $O..master ^maint diff --git a/RelNotes b/RelNotes index 3d420845b1..ecced08731 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.1.txt \ No newline at end of file +Documentation/RelNotes-1.6.2.txt \ No newline at end of file -- cgit v1.3 From f243319c21968c10d37cbb0c7f02127ac5d67d7f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 4 Mar 2009 00:37:50 -0800 Subject: Beginning of 1.6.2 maintenance track Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.2.1.txt | 6 ++++++ RelNotes | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.6.2.1.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.6.2.1.txt b/Documentation/RelNotes-1.6.2.1.txt new file mode 100644 index 0000000000..3a2d3bf849 --- /dev/null +++ b/Documentation/RelNotes-1.6.2.1.txt @@ -0,0 +1,6 @@ +GIT v1.6.2.1 Release Notes +========================== + +Fixes since v1.6.2 +------------------ + diff --git a/RelNotes b/RelNotes index ecced08731..cc85675c62 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.2.txt \ No newline at end of file +Documentation/RelNotes-1.6.2.1.txt \ No newline at end of file -- cgit v1.3 From 6207011ae3fe813159e92762e86f33c9bd42cd7f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 8 May 2009 21:49:14 -0700 Subject: Start 1.6.3.1 maintenance series. Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.3.1.txt | 12 ++++++++++++ RelNotes | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.6.3.1.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.6.3.1.txt b/Documentation/RelNotes-1.6.3.1.txt new file mode 100644 index 0000000000..98c02250bb --- /dev/null +++ b/Documentation/RelNotes-1.6.3.1.txt @@ -0,0 +1,12 @@ +GIT v1.6.3.1 Release Notes +========================== + +Fixes since v1.6.3 +------------------ + +-- +exec >/var/tmp/1 +O=v1.6.3 +echo O=$(git describe maint) +git shortlog $O..maint + diff --git a/RelNotes b/RelNotes index dd8bc4bb4a..0f6a588f1d 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.3.txt \ No newline at end of file +Documentation/RelNotes-1.6.3.1.txt \ No newline at end of file -- cgit v1.3 From 5a0e4a2a326966aabb566164a7571291e34adabd Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 8 May 2009 21:56:57 -0700 Subject: Start 1.6.4 development Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.6.4.txt | 59 ++++++++++++++++++++++++++++++++++++++++ RelNotes | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 Documentation/RelNotes-1.6.4.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.6.4.txt b/Documentation/RelNotes-1.6.4.txt new file mode 100644 index 0000000000..b70ec11c26 --- /dev/null +++ b/Documentation/RelNotes-1.6.4.txt @@ -0,0 +1,59 @@ +GIT v1.6.4 Release Notes +======================== + +With the next major release, "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. + +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. + +For a similar reason, "git push $there :$killed" to delete the branch +$killed in a remote repository $there, if $killed branch is the current +branch pointed at by its HEAD, gets a large warning. You can choose what +should happen upon such a push by setting the configuration variable +receive.denyDeleteCurrent in the receiving repository. + +When the user does not tell "git push" what to push, it has always +pushed matching refs. For some people it is unexpected, and a new +configuration variable push.default has been introduced to allow +changing a different default behaviour. To advertise the new feature, +a big warning is issued if this is not configured and a git push without +arguments is attempted. + + +Updates since v1.6.3 +-------------------- + +(subsystems) + +(performance) + +(usability, bells and whistles) + +(developers) + + +Fixes since v1.6.3 +------------------ + +All of the fixes in v1.6.3.X maintenance series are included in this +release, unless otherwise noted. + +Here are fixes that this release has, but have not been backported to +v1.6.3.X series. + + +--- +exec >/var/tmp/1 +echo O=$(git describe master) +O=v1.6.3 +git shortlog --no-merges $O..master ^maint diff --git a/RelNotes b/RelNotes index 0f6a588f1d..f8e49a5070 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.6.3.1.txt \ No newline at end of file +Documentation/RelNotes-1.6.4.txt \ No newline at end of file -- cgit v1.3 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 --- Documentation/RelNotes-1.6.5.txt | 51 ++++++++++++++++++++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.6.5.txt (limited to 'RelNotes') diff --git a/Documentation/RelNotes-1.6.5.txt b/Documentation/RelNotes-1.6.5.txt new file mode 100644 index 0000000000..856047d16f --- /dev/null +++ b/Documentation/RelNotes-1.6.5.txt @@ -0,0 +1,51 @@ +GIT v1.6.5 Release Notes +======================== + +In git 1.7.0, which is planned to be the release after 1.6.5, "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.4 +-------------------- + +(subsystems) + +(portability) + +(performance) + +(usability, bells and whistles) + +(developers) + +Fixes since v1.6.4 +------------------ + +# All of the fixes in v1.6.4.X maintenance series are included in this +# release, unless otherwise noted. + +# Here are fixes that this release has, but have not been backported to +# v1.6.4.X series. + + diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index d8ae315140..d7d9a9a063 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.6.4 +DEF_VER=v1.6.4.GIT LF=' ' 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.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.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.3