@@ -90,7 +90,11 @@ Updates since v1.5.0
90
90
which does what the name suggests.
91
91
92
92
93
- * Updated behaviour of existing commands.
93
+ * Updated behavior of existing commands.
94
+
95
+ - "git-merge-recursive" used to barf when there are more than
96
+ one common ancestors for the merge, and merging them had a
97
+ rename/rename conflict. This has been fixed.
94
98
95
99
- "git fsck" does not barf on corrupt loose objects.
96
100
@@ -113,10 +117,10 @@ Updates since v1.5.0
113
117
allow users to explicitly override this heuristic based on
114
118
paths.
115
119
116
- - The behaviour of 'git-apply', when run in a subdirectory,
120
+ - The behavior of 'git-apply', when run in a subdirectory,
117
121
without --index nor --cached were inconsistent with that of
118
122
the command with these options. This was fixed to match the
119
- behaviour with --index. A patch that is meant to be applied
123
+ behavior with --index. A patch that is meant to be applied
120
124
with -p1 from the toplevel of the project tree can be
121
125
applied with any custom -p<n> option. A patch that is not
122
126
relative to the toplevel needs to be applied with -p<n>
@@ -158,15 +162,17 @@ Updates since v1.5.0
158
162
the heaviest parts in C.
159
163
160
164
- "git mailinfo" which splits an e-mail into a patch and the
161
- metainformation was rewritten, thanks to Don Zickus. It
162
- handles nested multipart better.
165
+ meta-information was rewritten, thanks to Don Zickus. It
166
+ handles nested multipart better. The command was broken for
167
+ a brief period on 'master' branch since 1.5.0 but the
168
+ breakage is fixed now.
163
169
164
170
- send-email learned configurable bcc and chain-reply-to.
165
171
166
172
- "git remote show $remote" also talks about branches that
167
173
would be pushed if you run "git push remote".
168
174
169
- - Using objects from packs is now seriouly optimized by clever
175
+ - Using objects from packs is now seriously optimized by clever
170
176
use of a cache. This should be most noticeable in git-log
171
177
family of commands that involve reading many tree objects.
172
178
In addition, traversing revisions while filtering changes
@@ -178,7 +184,8 @@ Updates since v1.5.0
178
184
179
185
- The part to send out notification e-mails was removed from
180
186
the sample update hook, as it was not an appropriate place
181
- to do so.
187
+ to do so. The proper place to do this is the new post-receive
188
+ hook. An example hook has been added to contrib/hooks/.
182
189
183
190
184
191
* Others
@@ -188,7 +195,7 @@ Updates since v1.5.0
188
195
189
196
--
190
197
exec >/var/tmp/1
191
- O=v1.5.1-rc3-18-ge881192
198
+ O=v1.5.1-rc3-29-gd8b6a1a
192
199
echo O=`git describe master`
193
200
git shortlog --no-merges $O..master ^maint
194
201
0 commit comments