]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/RelNotes-1.7.1.txt
Merge branch 'rr/remote-helper-doc'
[thirdparty/git.git] / Documentation / RelNotes-1.7.1.txt
1 Git v1.7.1 Release Notes (draft)
2 ================================
3
4 Updates 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 for a password can be told to use an external program given via
11 GIT_ASKPASS.
12
13 * Conflict markers that lead the common ancestor in diff3-style output
14 now have a label, which hopefully would help third-party tools that
15 expect one.
16
17 * Comes with an updated bash-completion script.
18
19 * "git am" learned "--keep-cr" option to handle inputs that are
20 a mixture of changes to files with and without CRLF line endings.
21
22 * "git cvsimport" learned -R option to leave revision mapping between
23 CVS revisions and resulting git commits.
24
25 * "git diff --submodule" notices and describes dirty submodules.
26
27 * "git for-each-ref" learned %(symref), %(symref:short) and %(flag)
28 tokens.
29
30 * "git hash-object --stdin-paths" can take "--no-filters" option now.
31
32 * "git init" can be told to look at init.templatedir configuration
33 variable (obviously that has to come from either /etc/gitconfig or
34 $HOME/.gitconfig).
35
36 * "git grep" learned "--no-index" option, to search inside contents that
37 are not managed by git.
38
39 * "git grep" learned --color=auto/always/never.
40
41 * "git grep" learned to paint filename and line-number in colors.
42
43 * "git log -p --first-parent -m" shows one-parent diff for merge
44 commits, instead of showing combined diff.
45
46 * "git merge-file" learned to use custom conflict marker size and also
47 to use the "union merge" behaviour.
48
49 * "git notes" command has been rewritten in C and learned many commands
50 and features to help you carry notes forward across 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 describes 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
66 * "gitweb" installation procedure can use "minified" js/css files
67 better.
68
69 Fixes since v1.7.0
70 ------------------
71
72 All of the fixes in v1.7.0.X maintenance series are included in this
73 release, unless otherwise noted.
74
75 * "git add frotz/nitfol" did not complain when the entire frotz/ directory
76 was ignored.
77
78 * "git rev-list --pretty=oneline" didn't terminate a record with LF for
79 commits without any message.
80
81 * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike
82 newer tools in the git toolset.
83
84 ---
85 exec >/var/tmp/1
86 echo O=$(git describe)
87 O=v1.7.1-rc0-36-gb92cbb6
88 git shortlog --no-merges ^maint $O..