diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2021-01-12 21:42:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 21:42:53 +0530 |
| commit | 1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4 (patch) | |
| tree | 3cce3972dd01f6c5cc4884e5c7b99c5e2db7eae5 /app/src/main/java/dev/msfjarvis/aps/ui/git/base | |
| parent | 8bd156dea6e87eb667f76f4738fde992323ce0cf (diff) | |
| download | HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.tar.gz HardenedPass-1e9e5686afc2a6515f871c5f2ad4dc2ddc4731c4.zip | |
Allow configuring pull behaviour (#1276)
Diffstat (limited to 'app/src/main/java/dev/msfjarvis/aps/ui/git/base')
| -rw-r--r-- | app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt index 8b288d00..e5737227 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt +++ b/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt @@ -66,9 +66,9 @@ abstract class BaseGitActivity : ContinuationContainerActivity() { } val op = when (operation) { GitOp.CLONE -> CloneOperation(this, GitSettings.url!!) - GitOp.PULL -> PullOperation(this) + GitOp.PULL -> PullOperation(this, GitSettings.rebaseOnPull) GitOp.PUSH -> PushOperation(this) - GitOp.SYNC -> SyncOperation(this) + GitOp.SYNC -> SyncOperation(this, GitSettings.rebaseOnPull) GitOp.BREAK_OUT_OF_DETACHED -> BreakOutOfDetached(this) GitOp.RESET -> ResetToRemoteOperation(this) } |