feature<Pull>: remember user's choice for Pull

2026-04-30 22:01:10 +08:00 · 2022-05-26 17:43:01 +08:00
parent 0463879b29
commit e779d1b65e
3 changed files with 16 additions and 7 deletions
--- a/src/Models/Preference.cs
+++ b/src/Models/Preference.cs
@@ -141,6 +141,16 @@ namespace SourceGit.Models {
            /// </summary>
            public bool UseCombinedDiff { get; set; } = false;

+            /// <summary>
+            ///     Pull时是否使用Rebase替换Merge
+            /// </summary>
+            public bool UseRebaseOnPull { get; set; } = true;
+
+            /// <summary>
+            ///     Pull时是否使用自动暂存
+            /// </summary>
+            public bool UseAutoStashOnPull { get; set; } = true;
+
            /// <summary>
            ///     未暂存视图中变更显示方式
            /// </summary>