mirror of
https://github.com/sourcegit-scm/sourcegit
synced 2025-05-21 12:15:00 +00:00
enhance: do NOT remember the last selected handling method of uncommitted local changes (#977)
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
parent
c90b7afac1
commit
5199fb2b74
4 changed files with 9 additions and 27 deletions
|
@ -50,12 +50,6 @@ namespace SourceGit.Models
|
|||
set;
|
||||
} = true;
|
||||
|
||||
public DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
|
||||
{
|
||||
get;
|
||||
set;
|
||||
} = DealWithLocalChanges.DoNothing;
|
||||
|
||||
public bool EnableForceOnFetch
|
||||
{
|
||||
get;
|
||||
|
@ -68,12 +62,6 @@ namespace SourceGit.Models
|
|||
set;
|
||||
} = false;
|
||||
|
||||
public DealWithLocalChanges DealWithLocalChangesOnPull
|
||||
{
|
||||
get;
|
||||
set;
|
||||
} = DealWithLocalChanges.DoNothing;
|
||||
|
||||
public bool PreferRebaseInsteadOfMerge
|
||||
{
|
||||
get;
|
||||
|
@ -116,12 +104,6 @@ namespace SourceGit.Models
|
|||
set;
|
||||
} = false;
|
||||
|
||||
public DealWithLocalChanges DealWithLocalChangesOnCreateBranch
|
||||
{
|
||||
get;
|
||||
set;
|
||||
} = DealWithLocalChanges.DoNothing;
|
||||
|
||||
public bool CheckoutBranchOnCreateBranch
|
||||
{
|
||||
get;
|
||||
|
|
|
@ -11,9 +11,9 @@ namespace SourceGit.ViewModels
|
|||
|
||||
public Models.DealWithLocalChanges PreAction
|
||||
{
|
||||
get => _repo.Settings.DealWithLocalChangesOnCheckoutBranch;
|
||||
set => _repo.Settings.DealWithLocalChangesOnCheckoutBranch = value;
|
||||
}
|
||||
get;
|
||||
set;
|
||||
} = Models.DealWithLocalChanges.DoNothing;
|
||||
|
||||
public Checkout(Repository repo, string branch)
|
||||
{
|
||||
|
|
|
@ -21,9 +21,9 @@ namespace SourceGit.ViewModels
|
|||
|
||||
public Models.DealWithLocalChanges PreAction
|
||||
{
|
||||
get => _repo.Settings.DealWithLocalChangesOnCreateBranch;
|
||||
set => _repo.Settings.DealWithLocalChangesOnCreateBranch = value;
|
||||
}
|
||||
get;
|
||||
set;
|
||||
} = Models.DealWithLocalChanges.DoNothing;
|
||||
|
||||
public bool CheckoutAfterCreated
|
||||
{
|
||||
|
|
|
@ -40,9 +40,9 @@ namespace SourceGit.ViewModels
|
|||
|
||||
public Models.DealWithLocalChanges PreAction
|
||||
{
|
||||
get => _repo.Settings.DealWithLocalChangesOnPull;
|
||||
set => _repo.Settings.DealWithLocalChangesOnPull = value;
|
||||
}
|
||||
get;
|
||||
set;
|
||||
} = Models.DealWithLocalChanges.DoNothing;
|
||||
|
||||
public bool UseRebase
|
||||
{
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue