diff options
Diffstat (limited to 'Documentation/RelNotes/2.2.0.txt')
| -rw-r--r-- | Documentation/RelNotes/2.2.0.txt | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/Documentation/RelNotes/2.2.0.txt b/Documentation/RelNotes/2.2.0.txt index 741e14e26d..d4001c5ae5 100644 --- a/Documentation/RelNotes/2.2.0.txt +++ b/Documentation/RelNotes/2.2.0.txt @@ -40,7 +40,7 @@ UI, Workflows & Features diff backend when it exits with a non-zero status. * "git grep" allows to paint (or not paint) partial matches on - context lines whenshowing "grep -C<num>" output in color. + 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 @@ -62,7 +62,7 @@ UI, Workflows & Features 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 @@ -85,7 +85,7 @@ UI, Workflows & Features 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" @@ -292,6 +292,20 @@ notes for details). (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). |