diff options
| author | Robin Stocker <robin@nibor.org> | 2014-08-03 18:32:43 +1000 |
|---|---|---|
| committer | Robin Stocker <robin@nibor.org> | 2014-08-03 18:38:38 +1000 |
| commit | f5494c186f4fb54d13527944bd1b59ff8c291364 (patch) | |
| tree | 307c9f3a17bb383dafa84bbbdaac70707bdd23d2 /org.eclipse.jgit | |
| parent | 93530625cf26e9a06f976e1575269becdcbee283 (diff) | |
| download | jgit-f5494c186f4fb54d13527944bd1b59ff8c291364.tar.gz jgit-f5494c186f4fb54d13527944bd1b59ff8c291364.zip | |
Add isRebase to API of BranchConfig
Change-Id: I9819f49410e30d32c2157db0556a0dd6a0bcc5a4
Signed-off-by: Robin Stocker <robin@nibor.org>
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java index 3a2c54485d..a62f6c3b5d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/BranchConfig.java @@ -134,9 +134,17 @@ public class BranchConfig { * @since 3.5 */ public String getMerge() { - return config.getString( - ConfigConstants.CONFIG_BRANCH_SECTION, branchName, - ConfigConstants.CONFIG_KEY_MERGE); + return config.getString(ConfigConstants.CONFIG_BRANCH_SECTION, + branchName, ConfigConstants.CONFIG_KEY_MERGE); + } + + /** + * @return {@code true} if the branch is configured to be rebased + * @since 3.5 + */ + public boolean isRebase() { + return config.getBoolean(ConfigConstants.CONFIG_BRANCH_SECTION, + branchName, ConfigConstants.CONFIG_KEY_REBASE, false); } /** |