merge(3p/git): Merge git upstream at v2.26.2
This commit is contained in:
commit
5229c9b232
1006 changed files with 149006 additions and 60819 deletions
|
|
@ -315,7 +315,7 @@ notes for details).
|
|||
"git difftool --dir-diff" from a subdirectory never worked. This
|
||||
has been fixed.
|
||||
|
||||
* "git p4" that tracks multile p4 paths imported a single changelist
|
||||
* "git p4" that tracks multiple p4 paths imported a single changelist
|
||||
that touches files in these multiple paths as one commit, followed
|
||||
by many empty commits. This has been fixed.
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue