summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
diff options
context:
space:
mode:
authorPavel Salamon <pav.salamon@gmail.com>2023-01-12 16:39:07 +0100
committerMatthias Sohn <matthias.sohn@sap.com>2023-02-28 23:44:41 +0100
commit0518a6b0c16c1bce210bc9b2626104ef05975ee1 (patch)
tree969ae20851f68f69912696de8586ef0b91743425 /org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF
parent2d0b9080488239018908c7712dc440461991907a (diff)
downloadjgit-0518a6b0c16c1bce210bc9b2626104ef05975ee1.tar.gz
jgit-0518a6b0c16c1bce210bc9b2626104ef05975ee1.zip
Change config pull.rebase=preserve to pull.rebase=merges
The native git option to preserve merge commits during rebase has been changed from pull.rebase=preserve to pull.rebase=merges. This changeset in jgit makes the same config change. The old "preserve" option is no longer recognized and is replaced by new option called "merges". This makes jgit's rebase configuration compatible with native git versions 2.34 and newer where the old "preserve" option has been removed. Change-Id: Ic07ff954e258115e76465a1593ef3259f4c418a3
Diffstat (limited to 'org.eclipse.jgit.lfs.server/META-INF/MANIFEST.MF')
0 files changed, 0 insertions, 0 deletions