4 commits

Author	SHA1	Message	Date
leo	a0cddaea80	feature: support --ff-only option for git merge command ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 19:53:47 +08:00
leo	ddfc868df3	ux: re-design merge option style ... Signed-off-by: leo <longshuang@msn.cn>	2025-03-17 15:08:49 +08:00
leo	d3991c6535	fix: use --no-ff --no-commit for Don't Commit option in merge popup to ensure branch is not changed or updated with fast-forward commits (#532)	2024-10-01 20:44:14 +08:00
leo	9e048751ae	refactor: move non-observable object from ViewModels to Models ... * ViewModels.MergeMode -> Models.MergeMode * ViewModels.Notification -> Models.Notification * ViewModels.ResetMode -> Models.ResetMode * use `int` instead of `ViewModels.CountSelectedCommits`	2024-07-24 11:44:13 +08:00