michael/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit.git synced 2024-12-24 20:57:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

enhance: remember the last selection of Use rebase instead of merge on pull for each repository (#185)

Browse source
This commit is contained in:
leo 2024-06-19 15:36:49 +08:00
parent a717e48a29
commit dcc63e187b
No known key found for this signature in database
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ViewModels/Pull.cs
View file

@ -55,9 +55,9 @@ namespace SourceGit.ViewModels
public bool UseRebase public bool UseRebase
{ {
get; get => _repo.PreferRebaseInsteadOfMerge;
set; set => _repo.PreferRebaseInsteadOfMerge = value;
} = true; }
public Pull(Repository repo, Models.Branch specifiedRemoteBranch) public Pull(Repository repo, Models.Branch specifiedRemoteBranch)
{ {

6
src/ViewModels/Repository.cs
View file

@ -39,6 +39,12 @@ namespace SourceGit.ViewModels
set => SetProperty(ref _gitDir, value); set => SetProperty(ref _gitDir, value);
} }
public bool PreferRebaseInsteadOfMerge
{
get;
set;
} = true;
public AvaloniaList<string> Filters public AvaloniaList<string> Filters
{ {
get; get;