leo
c112549b69
refactor: query branch head after operation finished to avoid branch head mismatch
...
Signed-off-by: leo <longshuang@msn.cn>
2025-05-23 09:40:15 +08:00
leo
5fd074a9b6
refactor: use view locator instead of creating views manually in viewmodels ( #1213 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-19 11:14:19 +08:00
leo
8b39df32cc
feature: git command logs
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-17 13:23:56 +08:00
leo
0cb2ca78fe
code_review: PR #1180
...
- replace `SetNeedNavigateToUpstreamHead` with `NavigateToBranchDelayed`
- navigate to current HEAD instead of original source HEAD after merge
Signed-off-by: leo <longshuang@msn.cn>
2025-04-14 11:35:50 +08:00
Gadfly
17cf402c78
enhance: navigate to upstream head after fetch, pull, and merge ( #1180 )
2025-04-14 10:42:34 +08:00
leo
3049730dd5
feature: add Preferred Merge Mode in repository configure ( #1156 )
...
Signed-off-by: leo <longshuang@msn.cn>
2025-04-07 14:42:46 +08:00
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
GadflyFang
a4157e11e6
fix: Improve in-progress rebase handling ( #933 )
...
* fix: Improve in-progress rebase handling
* fix: Close merge popup even if there are conflicts (#941 )
2025-02-06 10:00:35 +08:00
leo
2053ce033d
feature: supports merge selected commit to current branch ( #800 )
2024-12-12 10:03:34 +08:00
leo
2504a52398
fix: wrong display when merge tag
...
* remove `Text.Merge.Source` translations from `de_DE`/`es_ES`/`fr_FR`/`it_IT`/`pt_BR`/`ru_RU` because its content has been changed
2024-12-10 15:38:06 +08:00
leo
94daa46db9
code_review: PR #793
...
* do NOT modify the existing merge, and add a new constructor for `Commands.Merge` instead
* rewrite `ViewModels.MergeMultiple`
- since `_histories.Commits.Find` may returns null, use `List<object>` instead of `List<Models.Commits>`
- supports display merge target as both `Models.Commit` and `Models.Branch`
* rename translation key `Text.MergeMultiple.Commit` to `Text.MergeMultiple.Targets`, and add translations for zh_CN and zh_TW
* some UI/UX changes
2024-12-09 21:12:58 +08:00
Dmitrij D. Czarkoff
dce33fdf60
feature: merge multiple heads ( #793 )
...
* feature: allow merging multiple heads
* feature: allow merging multiple branches from branch tree
2024-12-09 21:04:25 +08:00
leo
ccdc849baa
code_style: run dotnet format
2024-10-15 09:39:01 +08:00
leo
029f56cb28
feature: the default merge option supports reading branch.<name>.mergeoptions configuration ( #540 )
2024-10-06 22:21:18 +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
leo
96d4150d26
project: reorganize the structure of the project.
...
* remove dotnet-tool.json because the project does not rely on any dotnet tools.
* remove Directory.Build.props because the solution has only one project.
* move src/SourceGit to src. It's not needed to put all sources into a subfolder of src since there's only one project.
2024-04-02 20:00:33 +08:00
Enner Pérez
a1a14f8858
Project Location
2024-03-20 02:38:28 -05:00
leo
18aaa0a143
style: add .editorconfig for code formatting. see issu #25
2024-03-18 09:37:06 +08:00
leo
9c3294c285
optimize<*>: App.RaiseException should be called in UIThread; add default progress description for popups;
2024-02-26 11:29:57 +08:00
leo
2a62596999
refactor<*>: rewrite all with AvaloniaUI
2024-02-06 15:08:37 +08:00
