diff options
| author | Thomas Wolf <thomas.wolf@paranor.ch> | 2016-08-15 07:55:44 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2016-09-15 00:44:23 +0200 |
| commit | aadbb158e10ccc3194c4e7f2c1b3885b3c40571c (patch) | |
| tree | 99e91dafc7ebf198edb87c5754406ca48b7da172 /org.eclipse.jgit.lfs.test | |
| parent | 619329c84e41f9abe83616795d65af8c7fed5f3d (diff) | |
| download | jgit-aadbb158e10ccc3194c4e7f2c1b3885b3c40571c.tar.gz jgit-aadbb158e10ccc3194c4e7f2c1b3885b3c40571c.zip | |
Handle all values of branch.[name].rebase
BranchConfig treated this config property as a boolean, but git also
allows the values "preserve" and "interactive". Config property
pull.rebase also allows the same values.
Replace private enum PullCommand.PullRebaseMode by new public enum
BranchConfig.BranchRebaseMode and adapt all uses. Add a new setter to
PullCommand.
Note: PullCommand will treat "interactive" like "true", i.e., as a
non-interactive rebase. Not sure how "interactive" should be handled.
At least it won't balk on it.
Bug: 499482
Change-Id: I7309360f5662b2c2efa1bd8ea6f112c63cf064af
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
Diffstat (limited to 'org.eclipse.jgit.lfs.test')
0 files changed, 0 insertions, 0 deletions