]> source.dussan.org Git - jgit.git/commit
Merge branch 'master' into stable-6.3 98/195598/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 6 Sep 2022 13:58:47 +0000 (15:58 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 6 Sep 2022 13:58:47 +0000 (15:58 +0200)
commit370d1170e8cb1b93120e19e50c0648605ed95b52
tree02d1864c36dc3a9373c313d3fc195d9fe35a4bbe
parent7c4a5421ccd16b84b1ea4f3c1e566bfdf9c0e30d
parent57087e2b92dda967f6e5e0e0a017afae2f782a80
Merge branch 'master' into stable-6.3

* master:
  Move WorkTreeUpdater to merge package
  WorkTreeUpdater: use DirCacheCheckout#StreamSupplier
  DirCacheCheckout#getContent: also take InputStream supplier
  WorkTreeUpdater: remove safeWrite option

Change-Id: I8be570dbc4ad0d0b46046b85cbda24c3adcba170