mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-25 21:07:20 -08:00
feature: add --merge
and --keep
support to git reset
command (#514)
This commit is contained in:
parent
1ba294a07b
commit
1cda5d858e
1 changed files with 2 additions and 0 deletions
|
@ -9,6 +9,8 @@ namespace SourceGit.Models
|
||||||
new ResetMode("Soft", "Keep all changes. Stage differences", "--soft", Brushes.Green),
|
new ResetMode("Soft", "Keep all changes. Stage differences", "--soft", Brushes.Green),
|
||||||
new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", Brushes.Orange),
|
new ResetMode("Mixed", "Keep all changes. Unstage differences", "--mixed", Brushes.Orange),
|
||||||
new ResetMode("Hard", "Discard all changes", "--hard", Brushes.Red),
|
new ResetMode("Hard", "Discard all changes", "--hard", Brushes.Red),
|
||||||
|
new ResetMode("Merge", "Reset to a commit, keeping unmerged changes", "--merge", Brushes.Green),
|
||||||
|
new ResetMode("Keep", "Reset while keeping local modifications", "--keep", Brushes.Green),
|
||||||
];
|
];
|
||||||
|
|
||||||
public string Name { get; set; }
|
public string Name { get; set; }
|
||||||
|
|
Loading…
Reference in a new issue