]> source.dussan.org Git - jgit.git/commit
projects / jgit.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 06b40b9) | patch
Parse pull.rebase=preserve as alias for pull.rebase=merges 31/201431/3
authorMatthias Sohn <matthias.sohn@sap.com>
Fri, 21 Apr 2023 06:51:08 +0000 (08:51 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 22 Apr 2023 21:43:40 +0000 (23:43 +0200)
commit032eef5b12a25e0da48004eea589966ae0652433
tree6cd32787ed0a5c43879372c0852b4f4512417c54tree | snapshot
parent06b40b95c2ac28595624e1672949d245aef11fe0commit | diff
Parse pull.rebase=preserve as alias for pull.rebase=merges

This ensures backwards compatibility to the old config value which was
removed in git 2.34 which JGit followed in Ic07ff954e2.

Change-Id: I2b4e27fd71898b6e0e227e406c40682bd9786cd4
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandTest.java diff | blob | history
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/BranchConfigTest.java diff | blob | history
org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java diff | blob | history
JGit, the Java implementation of git: https://github.com/eclipse-jgit/jgit