# [ANNOUNCE] Git 1.7.1.rc0 3 messages from 2010-04-07 to 2010-04-07. Participants: Junio C Hamano, Sverre Rabbelier, Jeff King. Thread: https://gitlist.dev/t/23369 ## Junio C Hamano, 2010-04-07 15:05 Subject: [ANNOUNCE] Git 1.7.1.rc0 Message-ID: <7vmxxfe20g.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vmxxfe20g.fsf%40alter.siamese.dyndns.org ``` A release candidate Git 1.7.1.rc0 is available at the usual places for testing: http://www.kernel.org/pub/software/scm/git/ git-1.7.1.rc0.tar.{gz,bz2} (source tarball) git-htmldocs-1.7.1.rc0.tar.{gz,bz2} (preformatted docs) git-manpages-1.7.1.rc0.tar.{gz,bz2} (preformatted docs) The RPM binary packages for a few architectures are found in: testing/git-*-1.7.1.rc0-1.fc11.$arch.rpm (RPM) ---------------------------------------------------------------- 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. * "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. * "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 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 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. * "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 status" notices and descries dirty submodules. * "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 ------------------ 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. * "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. ``` ## Sverre Rabbelier, 2010-04-07 15:25 Subject: Re: [ANNOUNCE] Git 1.7.1.rc0 Message-ID: URL: https://gitlist.dev/e/t2pfabb9a1e1004070825q9df8a76aofdff7a2f460aee6d%40mail.gmail.com In-Reply-To: <7vmxxfe20g.fsf@alter.siamese.dyndns.org> ``` Heya, On Wed, Apr 7, 2010 at 10:05, Junio C Hamano wrote: >  * Conflict markers that lead the common ancestor in diff3-style output >   now has a label, which hopefully would help third-party tools that s/has/have/ >  * "git notes" command has been rewritten in C and learned quite a >   many commands and features Not sure if that is grammatically correct. >  * "git add frotz/nitfol" did not complain when the entire frotz/ directory >   was ignored. Glad that this is fixed now :). -- Cheers, Sverre Rabbelier ``` ## Jeff King, 2010-04-07 20:57 Subject: [PATCH] fix typos and grammar in 1.7.1 draft release notes Message-ID: <20100407205711.GA27012@coredump.intra.peff.net> URL: https://gitlist.dev/e/20100407205711.GA27012%40coredump.intra.peff.net In-Reply-To: <7vmxxfe20g.fsf@alter.siamese.dyndns.org> ``` Signed-off-by: Jeff King --- I noticed a few typos, so I went through and proofread the whole thing. I also caught all of the things Sverre noted, so you can disregard his message. I would also say 'the "--keep-cr" option' and "the -R option" instead of omitting the "the", but that is perhaps a matter of preference and not grammar. I didn't fix that in this patch. Documentation/RelNotes-1.7.1.txt | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/RelNotes-1.7.1.txt b/Documentation/RelNotes-1.7.1.txt index 02f9257..58cf113 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. -- 1.7.1.rc0.220.g92be4.dirty ```