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