1Git v1.7.1 Release Notes (draft) 2================================ 3 4Updates since v1.7.0 5-------------------- 6 7 * Eric Raymond is the maintainer of updated CIAbot scripts, in contrib/. 8 9 * Some commands (e.g. svn and http interfaces) that interactively ask 10 password can be told to use an external program given via GIT_ASKPASS. 11 12 * Conflict markers that lead the common ancestor in diff3-style output 13 now has a label, which hopefully would help third-party tools that 14 expect one. 15 16 * Comes with an updated bash-completion script. 17 18 * "git am" learned "--keep-cr" option to handle inputs that are 19 mixture of changes to files with and without CRLF line endings. 20 21 * "git cvsimport" learned -R option to leave revision mapping between 22 CVS revisions and resulting git commits. 23 24 * "git diff --submodule" notices and descries dirty submodules. 25 26 * "git for-each-ref" learned %(symref), %(symref:short) and %(flag) 27 tokens. 28 29 * "git hash-object --stdin-paths" can take "--no-filters" option now. 30 31 * "git init" can be told to look at init.templatedir configuration 32 variable (obviously that has to come from either /etc/gitconfig or 33 $HOME/.gitconfig). 34 35 * "git grep" learned "--no-index" option, to search inside contents that 36 are not managed by git. 37 38 * "git grep" learned --color=auto/always/never. 39 40 * "git grep" learned to paint filename and line-number in colors. 41 42 * "git log -p --first-parent -m" shows one-parent diff for merge 43 commits, instead of showing combined diff. 44 45 * "git merge-file" learned to use custom conflict marker size and also use 46 the "union merge" behaviour. 47 48 * "git notes" command has been rewritten in C and learned quite a 49 many commands and features to help you carry notes forward across 50 rebases and amends. 51 52 * "git request-pull" identifies the commit the request is relative to in 53 a more readable way. 54 55 * "git reset" learned "--keep" option that lets you discard commits 56 near the tip while preserving your local changes in a way similar 57 to how "git checkout branch" does. 58 59 * "git status" notices and descries dirty submodules. 60 61 * "git svn" should work better when interacting with repositories 62 with CRLF line endings. 63 64 * "git imap-send" learned to support CRAM-MD5 authentication. 65 66Fixes since v1.7.0 67------------------ 68 69All of the fixes in v1.7.0.X maintenance series are included in this 70release, unless otherwise noted. 71 72 * "git add frotz/nitfol" did not complain when the entire frotz/ directory 73 was ignored. 74 75 * "git rev-list --pretty=oneline" didn't terminate a record with LF for 76 commits without any message. 77 78 * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike 79 newer tools in the git toolset. 80 81--- 82exec >/var/tmp/1 83echo O=$(git describe) 84O=v1.7.0.4-382-gb807c52 85git shortlog --no-merges ^maint $O..