Merge pull request gitextensions#7367 from R0nd/7358

Implement git-reset --merge and --keep options
nick-bulleid · Nov 4, 2019 · 1efcf3f · 1efcf3f
2 parents 1ab5976 + d0991e6
commit 1efcf3f
Show file tree

Hide file tree

Showing 6 changed files with 193 additions and 77 deletions.
diff --git a/GitCommands/ArgumentBuilderExtensions.cs b/GitCommands/ArgumentBuilderExtensions.cs
@@ -224,6 +224,10 @@ string GetArgument()
                         return "--soft";
                     case ResetMode.Mixed:
                         return "--mixed";
+                    case ResetMode.Keep:
+                        return "--keep";
+                    case ResetMode.Merge:
+                        return "--merge";
                     case ResetMode.Hard:
                         return "--hard";
                     default:

diff --git a/GitCommands/Git/GitCommandHelpers.cs b/GitCommands/Git/GitCommandHelpers.cs
@@ -83,9 +83,15 @@ public enum ResetMode
         Mixed,
 
         /// <summary>--hard</summary>
-        Hard
+        Hard,
 
-        // All options are not implemented, like --merge, --keep, --patch
+        /// <summary>--merge</summary>
+        Merge,
+
+        /// <summary>--keep</summary>
+        Keep
+
+        // All options are not implemented, like --patch
     }
 
     public static class GitCommandHelpers

diff --git a/GitUI/HelperDialogs/FormResetCurrentBranch.Designer.cs b/GitUI/HelperDialogs/FormResetCurrentBranch.Designer.cs