diff options
| author | zeapo <mohamed@zenadi.com> | 2017-08-10 22:46:05 +0200 |
|---|---|---|
| committer | zeapo <mohamed@zenadi.com> | 2017-08-10 22:46:05 +0200 |
| commit | 8ae59a4922a61ce3f57e8bce8fbacbc43c873e08 (patch) | |
| tree | b346cd3f9ebd2ac43d4c38da7892629d62101a57 /app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | |
| parent | 2ca8f94cb7ed4617cf309b26e1defb2f99e197f4 (diff) | |
| download | HardenedPass-8ae59a4922a61ce3f57e8bce8fbacbc43c873e08.tar.gz HardenedPass-8ae59a4922a61ce3f57e8bce8fbacbc43c873e08.zip | |
add a way to see the git status and abort a rebase
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java index 6ca8bf49..9ab142c8 100644 --- a/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java +++ b/app/src/main/java/com/zeapo/pwdstore/git/PullOperation.java @@ -8,6 +8,7 @@ import com.zeapo.pwdstore.R; import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.PullCommand; +import org.eclipse.jgit.merge.MergeStrategy; import java.io.File; |