* "git difftool" learned an option to stop feeding paths to the
diff backend when it exits with a non-zero status.
+ * "git grep" allows to paint (or not paint) partial matches on
+ context lines when showing "grep -C<num>" output in color.
+
* "log --date=iso" uses a slight variant of ISO 8601 format that is
made more human readable. A new "--date=iso-strict" option gives
datetime output that is more strictly conformant.
e.g. "hello_BASE_4321.c").
* The temporary files "git mergetools" uses can be placed in a newly
- creted temporary directory, instead of the current directory, by
+ created temporary directory, instead of the current directory, by
setting the mergetool.writeToTemp configuration variable.
* "git mergetool" understands "--tool bc" now, as version 4 of
public repository really point the commits the pusher wanted to,
without having to "trust" the server.
- * "git interpret-trailers" is a new filter to programatically edit
+ * "git interpret-trailers" is a new filter to programmatically edit
the tail end of the commit log messages.
* "git help everyday" shows the "Everyday Git in 20 commands or so"
document, whose contents have been updated to more modern Git
practice.
+ * On the "git svn" front, work to reduce memory consumption and
+ to improve handling of mergeinfo progresses.
+
Performance, Internal Implementation, etc.
(merge b12d045 da/mergetool-meld later to maint).
* "git pack-objects" forgot to disable the codepath to generate
- object recheability bitmap when it needs to split the resulting
+ object reachability bitmap when it needs to split the resulting
pack.
(merge 2113471 jk/pack-objects-no-bitmap-when-splitting later to maint).
+
+ * The code to use cache-tree trusted the on-disk data too much and
+ fell into an infinite loop upon seeing an incorrectly recorded
+ index file.
+ (merge 729dbbd jk/cache-tree-protect-from-broken-libgit2 later to maint).
+
+ * "git fetch" into a repository where branch B was deleted earlier
+ back when it had reflog enabled, and then branch B/C is fetched
+ into it without reflog enabled, which is arguably an unlikely
+ corner case, unnecessarily failed.
+ (merge aae828b jk/fetch-reflog-df-conflict later to maint).
+
+ * "git log --first-parent -L..." used to crash.
+ (merge a8787c5 tm/line-log-first-parent later to maint).