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 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Documentation/RelNotes-1.7.1.txt (limited to 'Documentation/RelNotes-1.7.1.txt') 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.. -- cgit v1.2.3 From c2c85ed5d90d96a9d06170729a1a8b15af5256a4 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 17 Feb 2010 15:01:11 -0800 Subject: Update draft release notes to 1.7.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index b0bf8366c0..8c18ca5d22 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -4,6 +4,9 @@ Git v1.7.1 Release Notes Updates since v1.7.0 -------------------- + * "git grep" learned "--no-index" option, to search inside contents that + are not managed by git. + Fixes since v1.7.0 ------------------ @@ -13,5 +16,5 @@ release, unless otherwise noted. --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.0 +O=v1.7.0-36-gfaa3b47 git shortlog --no-merges ^maint $O.. -- cgit v1.2.3 From e007240cb940811a6e075d35f5c3a93a44c54f5a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 8 Mar 2010 00:54:05 -0800 Subject: Update draft release notes to 1.7.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 8c18ca5d22..dfc06cb3de 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -1,12 +1,30 @@ -Git v1.7.1 Release Notes -======================== +Git v1.7.1 Release Notes (draft) +================================ Updates since v1.7.0 -------------------- + * "git cvsimport" learned -R option to leave revision mapping between + CVS revisions and resulting git commits. + + * "git for-each-ref" learned %(symref), %(symref:short) and %(flag) + tokens. + * "git grep" learned "--no-index" option, to search inside contents that are not managed by git. + * "git grep" learned --color=auto/always/never. + + * "git hash-object --stdin-paths" can take "--no-filters" option now. + + * "git request-pull" identifies the commit the request is relative to in + a more readable way. + + * "git svn" should work better when interacting with repositories + with CRLF line endings. + + * "git imap-send" learned to support CRAM-MD5 authentication. + Fixes since v1.7.0 ------------------ @@ -16,5 +34,5 @@ release, unless otherwise noted. --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.0-36-gfaa3b47 +O=v1.7.0.2-181-gc6830a3 git shortlog --no-merges ^maint $O.. -- cgit v1.2.3 From 0d0925c5e25fad8079739be36d88faa21fc1f588 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 20 Mar 2010 11:42:34 -0700 Subject: Update draft release notes to 1.7.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index dfc06cb3de..06cefaf01b 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -4,22 +4,51 @@ Git v1.7.1 Release Notes (draft) Updates since v1.7.0 -------------------- + * Some commands (e.g. svn and http interfaces) that interactively ask + password can be told to use an external program given via GIT_ASKPASS. + + * Color values given to "color.." configuration can now have + more than one attributes (e.g. "bold ul"). + + * "git apply --whitespace=fix" didn't work well when an early patch in + a patch series adds trailing blank lines and a later one depended on + such a block of blank lines at the end. + + * "git am" learned "--keep-cr" option to handle inputs that are + mixture of changes to files with and without CRLF line endings. + * "git cvsimport" learned -R option to leave revision mapping between CVS revisions and resulting git commits. * "git for-each-ref" learned %(symref), %(symref:short) and %(flag) tokens. + * "git hash-object --stdin-paths" can take "--no-filters" option now. + + * "git init" can be told to look at init.templatedir configuration + variable (obviously that has to come from either /etc/gitconfig or + $HOME/.gitconfig). + * "git grep" learned "--no-index" option, to search inside contents that are not managed by git. * "git grep" learned --color=auto/always/never. - * "git hash-object --stdin-paths" can take "--no-filters" option now. + * "git grep" learned to paint filename and line-number in colors. + + * "git merge-file" learned to use custom conflict marker size and also use + the "union merge" behaviour. + + * "git notes" command has been rewritten in C and learned quite a + many commands. * "git request-pull" identifies the commit the request is relative to in a more readable way. + * "git reset" learned "--keep" option that lets you discard commits + near the tip while preserving your local changes in a way similar + to how "git checkout branch" does. + * "git svn" should work better when interacting with repositories with CRLF line endings. @@ -31,8 +60,11 @@ Fixes since v1.7.0 All of the fixes in v1.7.0.X maintenance series are included in this release, unless otherwise noted. + * "git add frotz/nitfol" did not complain when the entire frotz/ directory + was ignored. + --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.0.2-181-gc6830a3 +O=v1.7.0.2-322-g4e7d08a git shortlog --no-merges ^maint $O.. -- cgit v1.2.3 From 6a6955134b87ba3ea7d54467e637be0da7ba170b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 28 Mar 2010 21:57:59 -0700 Subject: Update draft release notes to 1.7.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 750d40f34a..19aeef5eff 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -7,19 +7,14 @@ Updates since v1.7.0 * Some commands (e.g. svn and http interfaces) that interactively ask password can be told to use an external program given via GIT_ASKPASS. - * Color values given to "color.." configuration can now have - more than one attributes (e.g. "bold ul"). - - * "git apply --whitespace=fix" didn't work well when an early patch in - a patch series adds trailing blank lines and a later one depended on - such a block of blank lines at the end. - * "git am" learned "--keep-cr" option to handle inputs that are mixture of changes to files with and without CRLF line endings. * "git cvsimport" learned -R option to leave revision mapping between CVS revisions and resulting git commits. + * "git diff --submodule" notices and descries dirty submodules. + * "git for-each-ref" learned %(symref), %(symref:short) and %(flag) tokens. @@ -36,11 +31,15 @@ Updates since v1.7.0 * "git grep" learned to paint filename and line-number in colors. + * "git log -p --first-parent -m" shows one-parent diff for merge + commits, instead of showing combined diff. + * "git merge-file" learned to use custom conflict marker size and also use the "union merge" behaviour. * "git notes" command has been rewritten in C and learned quite a - many commands. + many commands and features to help you carry notes forward across + rebases and amends. * "git request-pull" identifies the commit the request is relative to in a more readable way. @@ -49,6 +48,8 @@ Updates since v1.7.0 near the tip while preserving your local changes in a way similar to how "git checkout branch" does. + * "git status" notices and descries dirty submodules. + * "git svn" should work better when interacting with repositories with CRLF line endings. @@ -66,5 +67,5 @@ release, unless otherwise noted. --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.0.2-323-g0d0925c +O=v1.7.0.3-310-g99f5b08 git shortlog --no-merges ^maint $O.. -- cgit v1.2.3 From 537f6c7fb40257776a513128043112ea43b5cdb8 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 6 Apr 2010 15:00:01 -0700 Subject: Git 1.7.1-rc0 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 19aeef5eff..02f9257591 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -4,9 +4,17 @@ Git v1.7.1 Release Notes (draft) Updates since v1.7.0 -------------------- + * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/. + * Some commands (e.g. svn and http interfaces) that interactively ask password can be told to use an external program given via GIT_ASKPASS. + * Conflict markers that lead the common ancestor in diff3-style output + now has a label, which hopefully would help third-party tools that + expect one. + + * Comes with an updated bash-completion script. + * "git am" learned "--keep-cr" option to handle inputs that are mixture of changes to files with and without CRLF line endings. @@ -64,8 +72,14 @@ release, unless otherwise noted. * "git add frotz/nitfol" did not complain when the entire frotz/ directory was ignored. + * "git rev-list --pretty=oneline" didn't terminate a record with LF for + commits without any message. + + * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike + newer tools in the git toolset. + --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.0.3-310-g99f5b08 +O=v1.7.0.4-382-gb807c52 git shortlog --no-merges ^maint $O.. -- cgit v1.2.3 From e3af3cfc401420242a4a8873405f62e1aee5355b Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 7 Apr 2010 16:57:11 -0400 Subject: fix typos and grammar in 1.7.1 draft release notes Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 02f9257591..58cf113a90 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -7,21 +7,22 @@ Updates since v1.7.0 * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/. * Some commands (e.g. svn and http interfaces) that interactively ask - password can be told to use an external program given via GIT_ASKPASS. + for a password can be told to use an external program given via + GIT_ASKPASS. * Conflict markers that lead the common ancestor in diff3-style output - now has a label, which hopefully would help third-party tools that + now have a label, which hopefully would help third-party tools that expect one. * Comes with an updated bash-completion script. * "git am" learned "--keep-cr" option to handle inputs that are - mixture of changes to files with and without CRLF line endings. + a mixture of changes to files with and without CRLF line endings. * "git cvsimport" learned -R option to leave revision mapping between CVS revisions and resulting git commits. - * "git diff --submodule" notices and descries dirty submodules. + * "git diff --submodule" notices and describes dirty submodules. * "git for-each-ref" learned %(symref), %(symref:short) and %(flag) tokens. @@ -42,12 +43,11 @@ Updates since v1.7.0 * "git log -p --first-parent -m" shows one-parent diff for merge commits, instead of showing combined diff. - * "git merge-file" learned to use custom conflict marker size and also use - the "union merge" behaviour. + * "git merge-file" learned to use custom conflict marker size and also + to use the "union merge" behaviour. - * "git notes" command has been rewritten in C and learned quite a - many commands and features to help you carry notes forward across - rebases and amends. + * "git notes" command has been rewritten in C and learned many commands + and features to help you carry notes forward across rebases and amends. * "git request-pull" identifies the commit the request is relative to in a more readable way. @@ -56,7 +56,7 @@ Updates since v1.7.0 near the tip while preserving your local changes in a way similar to how "git checkout branch" does. - * "git status" notices and descries dirty submodules. + * "git status" notices and describes dirty submodules. * "git svn" should work better when interacting with repositories with CRLF line endings. -- cgit v1.2.3 From b9aa901856cee7ad16737343f6a372bb37871258 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 10 Apr 2010 13:05:16 -0700 Subject: Git 1.7.1-rc1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 58cf113a90..95c5ed6016 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -63,6 +63,9 @@ Updates since v1.7.0 * "git imap-send" learned to support CRAM-MD5 authentication. + * "gitweb" installation procedure can use "minified" js/css files + better. + Fixes since v1.7.0 ------------------ @@ -81,5 +84,5 @@ release, unless otherwise noted. --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.0.4-382-gb807c52 +O=v1.7.1-rc0-36-gb92cbb6 git shortlog --no-merges ^maint $O.. -- cgit v1.2.3 From 5469e2dab133a197dc2ca2fa47eb9e846ac19b66 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 18 Apr 2010 22:19:04 -0700 Subject: Git 1.7.1-rc2 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 95c5ed6016..10389adb4a 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -6,6 +6,8 @@ Updates since v1.7.0 * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/. + * gitk updates. + * Some commands (e.g. svn and http interfaces) that interactively ask for a password can be told to use an external program given via GIT_ASKPASS. @@ -66,6 +68,8 @@ Updates since v1.7.0 * "gitweb" installation procedure can use "minified" js/css files better. + * Various documentation updates. + Fixes since v1.7.0 ------------------ @@ -75,6 +79,9 @@ release, unless otherwise noted. * "git add frotz/nitfol" did not complain when the entire frotz/ directory was ignored. + * "git diff --stat" used "int" to count the size of differences, + which could result in overflowing. + * "git rev-list --pretty=oneline" didn't terminate a record with LF for commits without any message. @@ -84,5 +91,5 @@ release, unless otherwise noted. --- exec >/var/tmp/1 echo O=$(git describe) -O=v1.7.1-rc0-36-gb92cbb6 +O=v1.7.1-rc1-49-g407a963 git shortlog --no-merges ^maint $O.. -- cgit v1.2.3 From d599e0484f8ebac8cc50e9557a4c3d246826843d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 23 Apr 2010 18:27:17 -0700 Subject: Git 1.7.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.7.1.txt | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'Documentation/RelNotes-1.7.1.txt') diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 10389adb4a..9d89fedb36 100644 --- a/Documentation/RelNotes-1.7.1.txt +++ b/Documentation/RelNotes-1.7.1.txt @@ -1,5 +1,5 @@ -Git v1.7.1 Release Notes (draft) -================================ +Git v1.7.1 Release Notes +======================== Updates since v1.7.0 -------------------- @@ -87,9 +87,3 @@ release, unless otherwise noted. * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike newer tools in the git toolset. - ---- -exec >/var/tmp/1 -echo O=$(git describe) -O=v1.7.1-rc1-49-g407a963 -git shortlog --no-merges ^maint $O.. -- cgit v1.2.3