Skip to content

Commit dcc63e1

Browse files
committed
enhance: remember the last selection of Use rebase instead of merge on pull for each repository (#185)
1 parent a717e48 commit dcc63e1

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/ViewModels/Pull.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ public Models.DealWithLocalChanges PreAction
5555

5656
public bool UseRebase
5757
{
58-
get;
59-
set;
60-
} = true;
58+
get => _repo.PreferRebaseInsteadOfMerge;
59+
set => _repo.PreferRebaseInsteadOfMerge = value;
60+
}
6161

6262
public Pull(Repository repo, Models.Branch specifiedRemoteBranch)
6363
{

src/ViewModels/Repository.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,12 @@ public string GitDir
3939
set => SetProperty(ref _gitDir, value);
4040
}
4141

42+
public bool PreferRebaseInsteadOfMerge
43+
{
44+
get;
45+
set;
46+
} = true;
47+
4248
public AvaloniaList<string> Filters
4349
{
4450
get;

0 commit comments

Comments
 (0)