]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/RelNotes-1.6.3.txt
Sync with 1.6.2.4
[thirdparty/git.git] / Documentation / RelNotes-1.6.3.txt
1 GIT v1.6.3 Release Notes
2 ========================
3
4 With the next major release, "git push" into a branch that is
5 currently checked out will be refused by default. You can choose
6 what should happen upon such a push by setting the configuration
7 variable receive.denyCurrentBranch in the receiving repository.
8
9 To ease the transition plan, the receiving repository of such a
10 push running this release will issue a big warning when the
11 configuration variable is missing. Please refer to:
12
13 http://git.or.cz/gitwiki/GitFaq#non-bare
14 http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
15
16 for more details on the reason why this change is needed and the
17 transition plan.
18
19 For a similar reason, "git push $there :$killed" to delete the branch
20 $killed in a remote repository $there, if $killed branch is the current
21 branch pointed at by its HEAD, gets a large warning. You can choose what
22 should happen upon such a push by setting the configuration variable
23 receive.denyDeleteCurrent in the receiving repository.
24
25 When the user does not tell "git push" what to push, it has always
26 pushed matching refs. For some people it is unexpected, and a new
27 configuration variable push.default has been introduced to allow
28 changing a different default behaviour. To advertise the new feature,
29 a big warning is issued if this is not configured and a git push without
30 arguments is attempted.
31
32
33 Updates since v1.6.2
34 --------------------
35
36 (subsystems)
37
38 * various git-svn updates.
39
40 (performance)
41
42 * many uses of lstat(2) in the codepath for "git checkout" have been
43 optimized out.
44
45 (usability, bells and whistles)
46
47 * Boolean configuration variable yes/no can be written as on/off.
48
49 * rsync:/path/to/repo can be used to run git over rsync for local
50 repositories. It may not be useful in practice; meant primarily for
51 testing.
52
53 * http transport learned to prompt and use password when fetching from or
54 pushing to http://user@host.xz/ URL.
55
56 * (msysgit) progress output that is sent over the sideband protocol can
57 be handled appropriately in Windows console.
58
59 * "--pretty=<style>" option to the log family of commands can now be
60 spelled as "--format=<style>". In addition, --format=%formatstring
61 is a short-hand for --pretty=tformat:%formatstring.
62
63 * "--oneline" is a synonym for "--pretty=oneline --abbrev-commit".
64
65 * "--graph" to the "git log" family can draw the commit ancestry graph
66 in colors.
67
68 * If you realize that you botched the patch when you are editing hunks
69 with the 'edit' action in git-add -i/-p, you can abort the editor to
70 tell git not to apply it.
71
72 * The number of commits shown in "you are ahead/behind your upstream"
73 messages given by "git checkout" and "git status" used to count merge
74 commits; now it doesn't.
75
76 * @{-1} is a new way to refer to the last branch you were on introduced in
77 1.6.2, but the initial implementation did not teach this to a few
78 commands. Now the syntax works with "branch -m @{-1} newname".
79
80 * git-archive learned --output=<file> option.
81
82 * git-archive takes attributes from the tree being archived; strictly
83 speaking, this is an incompatible behaviour change, but is a good one.
84 Use --worktree-attributes option to allow it to read attributes from
85 the work tree as before (deprecated git-tar tree command always reads
86 attributes from the work tree).
87
88 * git-bisect shows not just the number of remaining commits whose goodness
89 is unknown, but also shows the estimated number of remaining rounds.
90
91 * You can give --date=<format> option to git-blame.
92
93 * "git-branch -r" shows HEAD symref that points at a remote branch in
94 interest of each tracked remote repository.
95
96 * "git-branch -v -v" is a new way to get list of names for branches and the
97 "upstream" branch for them.
98
99 * git-config learned -e option to open an editor to edit the config file
100 directly.
101
102 * git-clone runs post-checkout hook when run without --no-checkout.
103
104 * git-difftool is now part of the officially supported command, primarily
105 maintained by David Aguilar.
106
107 * git-for-each-ref learned a new "upstream" token.
108
109 * git-format-patch can be told to use attachment with a new configuration,
110 format.attach.
111
112 * git-format-patch can be told to produce deep or shallow message threads.
113
114 * git-format-patch can be told to always add sign-off with a configuration
115 variable.
116
117 * git-format-patch learned format.headers configuration to add extra
118 header fields to the output. This behaviour is similar to the existing
119 --add-header=<header> option of the command.
120
121 * git-format-patch gives human readable names to the attached files, when
122 told to send patches as attachments.
123
124 * git-grep learned to highlight the found substrings in color.
125
126 * git-imap-send learned to work around Thunderbird's inability to easily
127 disable format=flowed with a new configuration, imap.preformattedHTML.
128
129 * git-rebase can be told to rebase the series even if your branch is a
130 descendant of the commit you are rebasing onto with --force-rebase
131 option.
132
133 * git-rebase can be told to report diffstat with the --stat option.
134
135 * Output from git-remote command has been vastly improved.
136
137 * "git remote update --prune $remote" updates from the named remote and
138 then prunes stale tracking branches.
139
140 * git-send-email learned --confirm option to review the Cc: list before
141 sending the messages out.
142
143 (developers)
144
145 * Test scripts can be run under valgrind.
146
147 * Test scripts can be run with installed git.
148
149 * Makefile learned 'coverage' option to run the test suites with
150 coverage tracking enabled.
151
152 * Building the manpages with docbook-xsl between 1.69.1 and 1.71.1 now
153 requires setting DOCBOOK_SUPPRESS_SP to work around a docbook-xsl bug.
154 This workaround used to be enabled by default, but causes problems
155 with newer versions of docbook-xsl. In addition, there are a few more
156 knobs you can tweak to work around issues with various versions of the
157 docbook-xsl package. See comments in Documentation/Makefile for details.
158
159 Fixes since v1.6.2
160 ------------------
161
162 All of the fixes in v1.6.2.X maintenance series are included in this
163 release, unless otherwise noted.
164
165 Here are fixes that this release has, but have not been backported to
166 v1.6.2.X series.
167
168 * "git-apply" rejected a patch that swaps two files (i.e. renames A to B
169 and B to A at the same time). May need to be backported by cherry
170 picking d8c81df and then 7fac0ee).
171
172 * The initial checkout did not read the attributes from the .gitattribute
173 file that is being checked out.
174
175 * git-gc spent excessive amount of time to decide if an object appears
176 in a locally existing pack (if needed, backport by merging 69e020a).
177
178 ---
179 exec >/var/tmp/1
180 O=v1.6.3-rc1-1-gea10b60
181 echo O=$(git describe master)
182 git shortlog --no-merges $O..master ^maint