diff --git a/src/main/java/io/bit3/mgpm/worker/Worker.java b/src/main/java/io/bit3/mgpm/worker/Worker.java index 5324f5e..81eaa62 100644 --- a/src/main/java/io/bit3/mgpm/worker/Worker.java +++ b/src/main/java/io/bit3/mgpm/worker/Worker.java @@ -307,6 +307,11 @@ private void determineLocalBranchesAndUpstreams() throws GitProcessException { try { rebase = git("config", "--local", "--get", String.format("branch.%s.rebase", branchName)).toLowerCase(); + + if (StringUtils.isBlank(rebase)) { + // not defined for this branch, use global setting instead + rebase = git("config", "--get", "pull.rebase"); + } } catch (GitProcessException e) { // exception means, there is no remote configured }