We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
Use rebase instead of merge
1 parent a717e48 commit dcc63e1Copy full SHA for dcc63e1
src/ViewModels/Pull.cs
@@ -55,9 +55,9 @@ public Models.DealWithLocalChanges PreAction
55
56
public bool UseRebase
57
{
58
- get;
59
- set;
60
- } = true;
+ get => _repo.PreferRebaseInsteadOfMerge;
+ set => _repo.PreferRebaseInsteadOfMerge = value;
+ }
61
62
public Pull(Repository repo, Models.Branch specifiedRemoteBranch)
63
src/ViewModels/Repository.cs
@@ -39,6 +39,12 @@ public string GitDir
39
set => SetProperty(ref _gitDir, value);
40
}
41
42
+ public bool PreferRebaseInsteadOfMerge
43
+ {
44
+ get;
45
+ set;
46
+ } = true;
47
+
48
public AvaloniaList<string> Filters
49
50
get;
0 commit comments