mirror of
https://github.com/git/git.git
synced 2024-05-09 18:26:08 +02:00
Merge 8d092846c3
into e326e52010
This commit is contained in:
commit
c44d681a01
|
@ -144,7 +144,7 @@ Fixes since v2.22
|
|||
a blanket ban against them.
|
||||
|
||||
* The internal diff machinery can be made to read out of bounds while
|
||||
looking for --funcion-context line in a corner case, which has been
|
||||
looking for --function-context line in a corner case, which has been
|
||||
corrected.
|
||||
|
||||
Also contains various documentation updates, code clean-ups and minor fixups.
|
||||
|
|
|
@ -18,7 +18,7 @@ Fixes since v2.25.1
|
|||
.gitmodules is only cache-dirty, which has been corrected.
|
||||
|
||||
* "git rebase -i" identifies existing commits in its todo file with
|
||||
their abbreviated object name, which could become ambigous as it
|
||||
their abbreviated object name, which could become ambiguous as it
|
||||
goes to create new commits, and has a mechanism to avoid ambiguity
|
||||
in the main part of its execution. A few other cases however were
|
||||
not covered by the protection against ambiguity, which has been
|
||||
|
|
|
@ -8,7 +8,7 @@ Backward compatibility notes
|
|||
symbolic links are ignored.
|
||||
|
||||
* "git apply --3way" used to first attempt a straight application,
|
||||
and only fell back to the 3-way merge algorithm when the stright
|
||||
and only fell back to the 3-way merge algorithm when the straight
|
||||
application failed. Starting with this version, the command will
|
||||
first try the 3-way merge algorithm and only when it fails (either
|
||||
resulting with conflict or the base versions of blobs are missing),
|
||||
|
|
Loading…
Reference in New Issue