2 files changed, 10 insertions, 0 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt
index 82af814b..0b5f0270 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt
@@ -147,6 +147,14 @@ object GitSettings {
             }
         }
 
+    var rebaseOnPull
+        get() = settings.getBoolean(PreferenceKeys.REBASE_ON_PULL, true)
+        set(value) {
+            settings.edit {
+                putBoolean(PreferenceKeys.REBASE_ON_PULL, value)
+            }
+        }
+
     sealed class UpdateConnectionSettingsResult {
         class MissingUsername(val newProtocol: Protocol) : UpdateConnectionSettingsResult()
         class AuthModeMismatch(val newProtocol: Protocol, val validModes: List<AuthMode>) : UpdateConnectionSettingsResult()
diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt b/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
index 198be889..930a5427 100644
--- a/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
+++ b/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt
@@ -82,4 +82,6 @@ object PreferenceKeys {
     const val PROXY_PORT = "proxy_port"
     const val PROXY_USERNAME = "proxy_username"
     const val PROXY_PASSWORD = "proxy_password"
+
+    const val REBASE_ON_PULL = "rebase_on_pull"
 }