|
|
|
@ -62,7 +62,7 @@ UI, Workflows & Features
@@ -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 |
|
|
|
@ -292,6 +292,6 @@ notes for details).
@@ -292,6 +292,6 @@ 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). |
|
|
|
|