diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-21 08:51:08 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-04-22 23:43:40 +0200 |
| commit | 032eef5b12a25e0da48004eea589966ae0652433 (patch) | |
| tree | 6cd32787ed0a5c43879372c0852b4f4512417c54 /org.eclipse.jgit/src/org/eclipse/jgit/diff/HistogramDiff.java | |
| parent | 06b40b95c2ac28595624e1672949d245aef11fe0 (diff) | |
| download | jgit-032eef5b12a25e0da48004eea589966ae0652433.tar.gz jgit-032eef5b12a25e0da48004eea589966ae0652433.zip | |
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
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/diff/HistogramDiff.java')
0 files changed, 0 insertions, 0 deletions