feat(app): add the Compose git config and commit log screens

Author name and email, HEAD status, commit log, abort rebase, hard
reset and gc. The hard reset now warns and prefills the current branch;
a finished reset or gc stays on the screen with a snackbar, and a
failed operation keeps the screen too. The commit log is read off the
main thread. BreakOutOfDetached's not-rebasing dialog no longer
finishes the calling activity.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

7 files changed, 541 insertions, 3 deletions

diff --git a/app/src/main/java/app/passwordstore/ui/main/MainActivity.kt b/app/src/main/java/app/passwordstore/ui/main/MainActivity.kt
index c8b1861a..5cc2da86 100644
--- a/app/src/main/java/app/passwordstore/ui/main/MainActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/main/MainActivity.kt
@@ -40,6 +40,7 @@ import app.passwordstore.util.extensions.sharedPrefs
 import app.passwordstore.util.settings.AuthMode
 import app.passwordstore.util.settings.PreferenceKeys
 import app.passwordstore.util.shortcuts.ShortcutHandler
+import com.github.michaelbull.result.Result
 import com.github.michaelbull.result.onFailure
 import dagger.hilt.android.AndroidEntryPoint
 import java.io.File
@@ -228,6 +229,12 @@ class MainActivity : BaseGitActivity() {
     launchGitOperation(op).onFailure { promptOnErrorHandler(it) }
   }
 
+  /** Runs [op] (a hard reset against [branch]) and returns its outcome; the caller reports it. */
+  suspend fun gitOperation(op: GitOp, branch: String = ""): Result<Unit, Throwable> {
+    remoteBranch = branch
+    return launchGitOperation(op)
+  }
+
   /** Adds [file] to the launcher's dynamic shortcuts, as opening it from the list always did. */
   fun addShortcut(file: File) {
     val item = entryItem(file)
diff --git a/app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt b/app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt
new file mode 100644
index 00000000..d8001191
--- /dev/null
+++ b/app/src/main/java/app/passwordstore/ui/settings/GitConfigScreen.kt
@@ -0,0 +1,328 @@
+/*
+ * Copyright (C) 2026 Danilo M. <danix@danix.xyz>
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+package app.passwordstore.ui.settings
+
+import android.widget.Toast
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Button
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardCapitalization
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.LifecycleResumeEffect
+import androidx.lifecycle.lifecycleScope
+import app.passwordstore.R
+import app.passwordstore.data.repo.PasswordRepository
+import app.passwordstore.ui.compose.theme.SpacingLarge
+import app.passwordstore.ui.git.base.BaseGitActivity.GitOp
+import app.passwordstore.ui.main.MainActivity
+import app.passwordstore.ui.setup.SetupDialog
+import app.passwordstore.util.extensions.snackbar
+import com.github.michaelbull.result.fold
+import com.google.android.material.snackbar.Snackbar
+import kotlinx.coroutines.launch
+
+/**
+ * Author name and email with Save, then the repository utilities: HEAD ([head], already a
+ * sentence), commit log, abort rebase ([canAbort]), hard reset, gc. [busy] disables everything.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun GitConfigScreen(
+  name: String,
+  email: String,
+  head: String,
+  canAbort: Boolean,
+  busy: Boolean,
+  onNameChange: (String) -> Unit,
+  onEmailChange: (String) -> Unit,
+  onSave: () -> Unit,
+  onLog: () -> Unit,
+  onAbort: () -> Unit,
+  onReset: () -> Unit,
+  onGc: () -> Unit,
+  onBack: () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  Scaffold(
+    modifier = modifier,
+    topBar = {
+      TopAppBar(
+        title = { Text(stringResource(R.string.title_activity_git_config)) },
+        navigationIcon = {
+          IconButton(onClick = onBack) {
+            Icon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.entry_back))
+          }
+        },
+      )
+    },
+  ) { padding ->
+    Column(
+      Modifier.padding(padding)
+        .fillMaxSize()
+        .verticalScroll(rememberScrollState())
+        .padding(SpacingLarge),
+      verticalArrangement = Arrangement.spacedBy(SpacingLarge),
+    ) {
+      val field = Modifier.fillMaxWidth()
+      OutlinedTextField(
+        value = name,
+        onValueChange = onNameChange,
+        modifier = field,
+        enabled = !busy,
+        label = { Text(stringResource(R.string.git_user_name_hint)) },
+        singleLine = true,
+        keyboardOptions =
+          KeyboardOptions(capitalization = KeyboardCapitalization.Words, imeAction = ImeAction.Next),
+      )
+      OutlinedTextField(
+        value = email,
+        onValueChange = onEmailChange,
+        modifier = field,
+        enabled = !busy,
+        label = { Text(stringResource(R.string.git_user_email)) },
+        singleLine = true,
+        keyboardOptions =
+          KeyboardOptions(
+            autoCorrectEnabled = false,
+            keyboardType = KeyboardType.Email,
+            imeAction = ImeAction.Done,
+          ),
+      )
+      Button(onClick = onSave, modifier = Modifier.align(Alignment.End), enabled = !busy) {
+        Text(stringResource(R.string.crypto_save))
+      }
+      Text(stringResource(R.string.git_tools), style = MaterialTheme.typography.titleLarge)
+      Text(head)
+      if (busy) LinearProgressIndicator(field)
+      OutlinedButton(onClick = onLog, modifier = field, enabled = !busy) {
+        Text(stringResource(R.string.git_log))
+      }
+      OutlinedButton(onClick = onAbort, modifier = field, enabled = canAbort && !busy) {
+        Text(stringResource(R.string.abort_rebase))
+      }
+      OutlinedButton(onClick = onReset, modifier = field, enabled = !busy) {
+        Text(stringResource(R.string.reset_to_remote))
+      }
+      OutlinedButton(onClick = onGc, modifier = field, enabled = !busy) {
+        Text(stringResource(R.string.git_run_gc_job))
+      }
+    }
+  }
+}
+
+/** Asks before a hard reset, for the remote [branch] to reset to. */
+@Composable
+fun ResetDialog(
+  branch: String,
+  onBranchChange: (String) -> Unit,
+  onConfirm: () -> Unit,
+  onDismiss: () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  AlertDialog(
+    onDismissRequest = onDismiss,
+    modifier = modifier,
+    title = { Text(stringResource(R.string.reset_to_remote)) },
+    text = {
+      Column(verticalArrangement = Arrangement.spacedBy(SpacingLarge)) {
+        Text(stringResource(R.string.git_reset_confirm_message))
+        OutlinedTextField(
+          value = branch,
+          onValueChange = onBranchChange,
+          modifier = Modifier.fillMaxWidth(),
+          label = { Text(stringResource(R.string.git_utils_reset_remote_branch_title)) },
+          singleLine = true,
+          keyboardOptions = KeyboardOptions(autoCorrectEnabled = false),
+        )
+      }
+    },
+    confirmButton = {
+      TextButton(onClick = onConfirm, enabled = branch.isNotBlank()) {
+        Text(stringResource(R.string.dialog_ok))
+      }
+    },
+    dismissButton = {
+      TextButton(onClick = onDismiss) { Text(stringResource(R.string.dialog_cancel)) }
+    },
+  )
+}
+
+private enum class GitConfigDialog {
+  InvalidEmail,
+  Reset,
+}
+
+/**
+ * The git config screen: wires [GitConfigScreen] to the [viewModel] and runs the utilities as git
+ * operations of [activity]. A successful reset or gc stays here with a short snackbar; an abort
+ * shows its report, which closes the screen; a failure shows the git error dialog and the screen
+ * stays.
+ */
+@Composable
+fun GitConfigDestination(
+  activity: MainActivity,
+  onClose: () -> Unit,
+  onLog: () -> Unit,
+  modifier: Modifier = Modifier,
+  viewModel: GitConfigViewModel = hiltViewModel(),
+) {
+  var dialog by rememberSaveable { mutableStateOf<GitConfigDialog?>(null) }
+  var branch by rememberSaveable { mutableStateOf("") }
+
+  LifecycleResumeEffect(Unit) {
+    viewModel.refresh()
+    onPauseOrDispose {}
+  }
+  // A running operation holds the screen: leaving would cancel it half way.
+  BackHandler(enabled = viewModel.busy) {}
+  // A finished reset or gc is announced once, also when the screen was recreated in between:
+  // the result stays in the ViewModel until the snackbar was shown.
+  val done = viewModel.done
+  LaunchedEffect(done) {
+    val label =
+      when (done) {
+        GitOp.RESET -> R.string.reset_to_remote
+        GitOp.GC -> R.string.git_run_gc_job
+        else -> return@LaunchedEffect
+      }
+    activity.snackbar(
+      message = activity.getString(R.string.git_tool_done, activity.getString(label)),
+      length = Snackbar.LENGTH_LONG,
+    )
+    viewModel.done = null
+  }
+
+  // ponytail: the activity's scope, like every git operation of the app: a theme or locale change
+  // cancels it, and the finally block frees the screen.
+  fun run(op: GitOp, remote: String = "") {
+    if (viewModel.busy) return
+    viewModel.busy = true
+    activity.lifecycleScope.launch {
+      try {
+        activity
+          .gitOperation(op, remote)
+          .fold(
+            success = {
+              if (op == GitOp.BREAK_OUT_OF_DETACHED)
+                viewModel.abortedBranch = PasswordRepository.getCurrentBranch()
+              viewModel.done = op
+            },
+            failure = { activity.promptOnErrorHandler(it) },
+          )
+      } finally {
+        viewModel.busy = false
+        viewModel.refresh()
+      }
+    }
+  }
+
+  val head =
+    when (val status = viewModel.head) {
+      is HeadStatus.Branch -> stringResource(R.string.git_head_on_branch, status.name)
+      is HeadStatus.Detached -> stringResource(R.string.git_head_detached, status.hash)
+      HeadStatus.Missing -> stringResource(R.string.git_head_missing)
+      null -> ""
+    }
+  Box(modifier) {
+    GitConfigScreen(
+      name = viewModel.name,
+      email = viewModel.email,
+      head = head,
+      canAbort = viewModel.canAbort,
+      busy = viewModel.busy,
+      onNameChange = { viewModel.name = it },
+      onEmailChange = { viewModel.email = it },
+      onSave = {
+        if (viewModel.save()) {
+          Toast.makeText(activity, R.string.git_server_config_save_success, Toast.LENGTH_SHORT)
+            .show()
+          onClose()
+        } else dialog = GitConfigDialog.InvalidEmail
+      },
+      onLog = onLog,
+      onAbort = {
+        // Checked again: BreakOutOfDetached reports success without doing anything otherwise.
+        if (PasswordRepository.repository?.let(::needsAbort) == true)
+          run(GitOp.BREAK_OUT_OF_DETACHED)
+        else viewModel.refresh()
+      },
+      onReset = {
+        branch = PasswordRepository.getCurrentBranch().orEmpty()
+        dialog = GitConfigDialog.Reset
+      },
+      onGc = { run(GitOp.GC) },
+      onBack = { if (!viewModel.busy) onClose() },
+    )
+    when (dialog) {
+      null -> Unit
+      GitConfigDialog.InvalidEmail ->
+        SetupDialog(
+          text = stringResource(R.string.invalid_email_dialog_text),
+          confirm = stringResource(R.string.dialog_ok),
+          onConfirm = { dialog = null },
+          onDismiss = { dialog = null },
+        )
+      GitConfigDialog.Reset ->
+        ResetDialog(
+          branch = branch,
+          onBranchChange = { branch = it },
+          onConfirm = {
+            dialog = null
+            run(GitOp.RESET, branch.trim())
+          },
+          onDismiss = { dialog = null },
+        )
+    }
+    if (done == GitOp.BREAK_OUT_OF_DETACHED) {
+      val aborted = viewModel.abortedBranch.orEmpty()
+      SetupDialog(
+        title = stringResource(R.string.git_abort_and_push_title),
+        text =
+          stringResource(
+            R.string.git_break_out_of_detached_success,
+            aborted,
+            "conflicting-$aborted-...",
+          ),
+        confirm = stringResource(R.string.dialog_ok),
+        onConfirm = onClose,
+        onDismiss = onClose,
+      )
+    }
+  }
+}
diff --git a/app/src/main/java/app/passwordstore/ui/settings/GitConfigViewModel.kt b/app/src/main/java/app/passwordstore/ui/settings/GitConfigViewModel.kt
new file mode 100644
index 00000000..8882ed87
--- /dev/null
+++ b/app/src/main/java/app/passwordstore/ui/settings/GitConfigViewModel.kt
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2026 Danilo M. <danix@danix.xyz>
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+package app.passwordstore.ui.settings
+
+import android.util.Patterns
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import app.passwordstore.data.repo.PasswordRepository
+import app.passwordstore.ui.git.base.BaseGitActivity.GitOp
+import app.passwordstore.util.coroutines.DispatcherProvider
+import app.passwordstore.util.settings.GitSettings
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/**
+ * The git config screen's state: author name and email being edited, HEAD, and the git operation
+ * that runs or succeeded. The operation itself runs in the destination (it needs the activity);
+ * this ViewModel keeps what must survive a recreation.
+ */
+@HiltViewModel
+class GitConfigViewModel
+@Inject
+constructor(
+  private val gitSettings: GitSettings,
+  private val dispatcherProvider: DispatcherProvider,
+) : ViewModel() {
+
+  var name by mutableStateOf(gitSettings.authorName)
+  var email by mutableStateOf(gitSettings.authorEmail)
+
+  var head by mutableStateOf<HeadStatus?>(null)
+    private set
+
+  var canAbort by mutableStateOf(false)
+    private set
+
+  /** A git operation runs; everything waits. */
+  var busy by mutableStateOf(false)
+
+  /**
+   * The operation that succeeded and is not reported yet: a reset or gc gets a snackbar (then this
+   * goes back to null), an abort its dialog.
+   */
+  var done by mutableStateOf<GitOp?>(null)
+
+  /** The branch an abort pushed from, for its report. */
+  var abortedBranch by mutableStateOf<String?>(null)
+
+  init {
+    refresh()
+  }
+
+  /** Re-reads HEAD and the rebase state, off the main thread. */
+  fun refresh() {
+    viewModelScope.launch {
+      val repo = PasswordRepository.repository
+      val (status, abort) =
+        withContext(dispatcherProvider.io()) {
+          if (repo == null) HeadStatus.Missing to false else headStatus(repo) to needsAbort(repo)
+        }
+      head = status
+      canAbort = abort
+    }
+  }
+
+  /** Saves name and email; false, saving nothing, when the email is not an address. */
+  fun save(): Boolean {
+    val address = email.trim()
+    if (!Patterns.EMAIL_ADDRESS.matcher(address).matches()) return false
+    gitSettings.authorEmail = address
+    gitSettings.authorName = name.trim()
+    return true
+  }
+}
diff --git a/app/src/main/java/app/passwordstore/ui/settings/GitLogScreen.kt b/app/src/main/java/app/passwordstore/ui/settings/GitLogScreen.kt
new file mode 100644
index 00000000..276c9c11
--- /dev/null
+++ b/app/src/main/java/app/passwordstore/ui/settings/GitLogScreen.kt
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2026 Danilo M. <danix@danix.xyz>
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+package app.passwordstore.ui.settings
+
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontFamily
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import app.passwordstore.R
+import app.passwordstore.data.repo.PasswordRepository
+import app.passwordstore.util.coroutines.DispatcherProvider
+import app.passwordstore.util.git.GitCommit
+import dagger.hilt.android.lifecycle.HiltViewModel
+import java.time.ZoneId
+import java.time.format.DateTimeFormatter
+import java.time.format.FormatStyle
+import java.util.Locale
+import javax.inject.Inject
+import kotlinx.collections.immutable.ImmutableList
+import kotlinx.collections.immutable.toImmutableList
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+/** The store's commits, read once off the main thread. */
+@HiltViewModel
+class GitLogViewModel @Inject constructor(dispatcherProvider: DispatcherProvider) : ViewModel() {
+
+  /** Null while loading. */
+  var commits by mutableStateOf<ImmutableList<GitCommit>?>(null)
+    private set
+
+  init {
+    viewModelScope.launch {
+      commits =
+        withContext(dispatcherProvider.io()) {
+          gitLog(PasswordRepository.repository).toImmutableList()
+        }
+    }
+  }
+}
+
+/**
+ * The commit log, newest first: message, short hash, date. A progress bar while [commits] is null.
+ */
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun GitLogScreen(
+  commits: ImmutableList<GitCommit>?,
+  onBack: () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  val formatter = remember {
+    DateTimeFormatter.ofLocalizedDateTime(FormatStyle.MEDIUM)
+      .withLocale(Locale.getDefault())
+      .withZone(ZoneId.systemDefault())
+  }
+  Scaffold(
+    modifier = modifier,
+    topBar = {
+      TopAppBar(
+        title = { Text(stringResource(R.string.title_activity_git_log)) },
+        navigationIcon = {
+          IconButton(onClick = onBack) {
+            Icon(Icons.AutoMirrored.Filled.ArrowBack, stringResource(R.string.entry_back))
+          }
+        },
+      )
+    },
+  ) { padding ->
+    if (commits == null) LinearProgressIndicator(Modifier.padding(padding).fillMaxWidth())
+    else
+      LazyColumn(Modifier.padding(padding).fillMaxSize()) {
+        items(commits, key = GitCommit::hash) { commit ->
+          ListItem(
+            headlineContent = { Text(commit.shortMessage) },
+            overlineContent = { Text(commit.hash.take(8), fontFamily = FontFamily.Monospace) },
+            supportingContent = { Text(formatter.format(commit.time)) },
+          )
+          HorizontalDivider()
+        }
+      }
+  }
+}
+
+@Composable
+fun GitLogDestination(
+  onClose: () -> Unit,
+  modifier: Modifier = Modifier,
+  viewModel: GitLogViewModel = hiltViewModel(),
+) {
+  GitLogScreen(commits = viewModel.commits, onBack = onClose, modifier = modifier)
+}
diff --git a/app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt b/app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt
index d55d9970..4b4913d0 100644
--- a/app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt
+++ b/app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt
@@ -57,9 +57,8 @@ class BreakOutOfDetached(callingActivity: AppCompatActivity) : GitOperation(call
         .setMessage(
           callingActivity.resources.getString(R.string.git_break_out_of_detached_unneeded)
         )
-        .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok)) { _, _ ->
-          callingActivity.finish()
-        }
+        // Only closes the dialog: the calling activity is the app's main screen.
+        .setPositiveButton(callingActivity.resources.getString(R.string.dialog_ok), null)
         .show()
       false
     } else {
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 50566188..28a38301 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -380,5 +380,7 @@
   <string name="store_delete_failed">Impossibile eliminare tutto il contenuto della cartella dell\'archivio.</string>
   <string name="clear_saved_secret_message">Verrà chiesto di nuovo alla prossima operazione Git.</string>
   <string name="invalid_proxy_port">Inserisci una porta da 1 a 65535, oppure niente</string>
+  <string name="git_reset_confirm_message">I commit e le modifiche locali che non sono su questo remote branch vengono scartati.</string>
+  <string name="git_tool_done">%1$s: completato</string>
   <string name="store_delete_confirm">Eliminare l\'archivio locale? Le voci di cui non è stato fatto il push sul remote vanno perse.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 02f02e18..403ee2ae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -415,5 +415,7 @@
   <string name="store_delete_failed">Could not delete everything in the store folder.</string>
   <string name="clear_saved_secret_message">It will be asked again at the next Git operation.</string>
   <string name="invalid_proxy_port">Enter a port from 1 to 65535, or nothing</string>
+  <string name="git_reset_confirm_message">Local commits and changes that are not on this remote branch are discarded.</string>
+  <string name="git_tool_done">%1$s: done</string>
   <string name="store_delete_confirm">Delete the local store? Entries not pushed to the remote are lost.</string>
 </resources>