Fix individual manual render removing step index

Urigo · May 14, 2019 · b81b622 · b81b622
1 parent d136267
commit b81b622
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/manual.ts b/src/manual.ts
@@ -137,16 +137,16 @@ function renderManual(step?: string | (() => void)) {
     Git(['add', symlinkPath]);
   });
 
-  // Continue if should
-  if (shouldContinue) {
-    Git.print(['rebase', '--continue'], {
+  if (shouldContinue || Git.stagedFiles().length) {
+    Git.print(['commit', '--amend'], {
       env: {
         GIT_EDITOR: true,
       },
     });
-  // Amend only if necessary, otherwise there might be unexpected things going on
-  } else if (Git.stagedFiles().length) {
-    Git.print(['commit', '--amend'], {
+  }
+
+  if (shouldContinue) {
+    Git.print(['rebase', '--continue'], {
       env: {
         GIT_EDITOR: true,
       },