Alexander Bogomolets
927a1cab24
Add checkout local changes handling
...
This commit adds the local changes handling behavior for branch checkout.
One of three can be selected: stash and reapply after checkout, discard changes or leave them as is (previous behaviour)
2024-04-29 16:40:20 +08:00
leo
84568e573a
feature: test if conflicts have been resolved manually ( #96 )
2024-04-29 10:54:41 +08:00
leo
df66bacbd2
enhance: reset commit message after a merge request has been aborted
2024-04-29 09:31:04 +08:00
leo
32e685622b
enhance: disable some MenuItems if repository that linked by node has been auto-removed from Preference ( #90 ).
2024-04-28 13:51:44 +08:00
leo
9b5e8429b9
feature: add hotkey 'F5' to reload/refresh whole repository
2024-04-28 10:19:12 +08:00
leo
86c89e0c33
feature: use MERGE_MSG as default commit message while merging ( #88 )
2024-04-26 21:05:00 +08:00
leo
ea1d0bf6a2
fix: bug - rename local branch name should only check names with other local branches
2024-04-26 14:25:14 +08:00
leo
003ad66ccb
ux: add menu icon for git-flow
2024-04-15 15:07:07 +08:00
leo
ab26bb83e9
refactor: re-design toolbar of Views.DiffView
2024-04-14 12:27:09 +08:00
leo
7b5534a267
code_style: run dotnet format to apply rules defined in .editorconfig
2024-04-13 19:24:45 +08:00
Gadfly
54c9552985
refactor: remove duplicate ObjectConverters, remove unused using
2024-04-13 18:54:46 +08:00
Gadfly
f4e1e0fb6b
fix: use TextTrimming alternative PathConverters
2024-04-13 02:05:26 +08:00
Gadfly
a249eed1ac
feat: show git file mode change if exist
2024-04-12 21:38:36 +08:00
leo
f3f39ac593
feature: supports resolving multiple conflicts at once.
2024-04-11 20:50:19 +08:00
leo
b8da3e9afd
enhance: use diff command instead of show command to get changes of selected commit. ( #56 )
...
* for merge commit, it will shows all changes compare to the first parent of the selected commit now.
2024-04-09 16:02:42 +08:00
leo
17fc7ab994
ux: add icons for external merge tools
2024-04-09 15:00:52 +08:00
leo
4882fd9d69
refactor: external tools and shells
...
* rename Models.ExternalMergeTools to Models.ExternalMerger
* supports Git Bash/PowerShell/Command Prompt/Default Shell in Windows Terminal
2024-04-09 10:41:37 +08:00
leo
4ac705f8ca
feature: add powershell support for Windows
2024-04-08 17:39:52 +08:00
leo
8adf11b64c
fix: crash when create image from a empty stream
2024-04-08 10:24:28 +08:00
leo
8dd1ce9185
refactor: rewrite Commands.QueryFileContent and use it instead of GetImageFileAsBitmap
2024-04-08 09:57:41 +08:00
leo
9a4f928ece
fix: DataGrid does NOT scroll when navigation target is the same as current selected in Views.Histories. ( #58 )
2024-04-07 21:19:02 +08:00
leo
d09e81b80a
fix: remove unused using
2024-04-07 20:06:04 +08:00
leo
24b6e39066
feature: add context menu for changes in Views.CommitDetail and Views.RevisionCompare to diff with external merge tool ( #53 )
2024-04-07 20:02:43 +08:00
leo
e5be649a2d
fix: Github REST API access rate limit ( #60 )
2024-04-07 09:54:35 +08:00
leo
d873f21b6a
fix: crash when open external tool drop down menu
2024-04-06 15:01:07 +08:00
leo
111bf2966a
refactor: rewrite external editor supports
...
* supported editors can be different on different platforms.
* display founded editors only
2024-04-06 13:14:22 +08:00
leo
d986aa7165
feature: add button to navigate to current HEAD ( #50 )
2024-04-02 20:54:57 +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
f175f5abc1
optimize: use combined diff view as default.
2024-03-20 13:08:01 +08:00
leo
18aaa0a143
style: add .editorconfig for code formatting. see issu #25
2024-03-18 09:37:06 +08:00
Enner Pérez
c0a079de41
Source Generated Regex
2024-03-16 04:09:27 -05:00
leo
f93dec5e6a
style: Blame & FileHistories window style
2024-03-15 10:41:36 +08:00
leo
f4b396596b
feature: shows selected revision file size if it's a binary file
2024-03-14 11:59:56 +08:00
leo
f6eb1281b5
enhance: force using StringComparison.Ordinal
2024-03-14 11:09:05 +08:00
leo
a37c11e32f
enhance: better sync scroll logic with two-side diff - if the width in each side is different
2024-03-12 16:14:22 +08:00
leo
2ec46c9da0
feature: prefer same name if new branch is created based on a remote branch
2024-03-08 18:01:29 +08:00
leo
8d533e5270
style: UseRebase and AutoStash perfered selected by default
2024-03-08 17:49:03 +08:00
leo
267c955c88
style: views supports Linux
2024-03-08 11:28:17 +08:00
leo
a89760c7a5
refactor: change the way to refresh repository's data.
...
* mark dirty instead of calling refresh method directly
* force mark branches data dirty after remotes changed
2024-03-08 09:57:29 +08:00
leo
3eb8a82005
feature: use branch's fullname to create new branch based on selected one
2024-03-08 09:29:54 +08:00
leo
d0e80be79f
feature: enhance commit search
...
* Supports search commits by author/committer email
* Auto focus when search panel is visible
2024-03-07 16:29:24 +08:00
leo
3bf962d745
feature: remember last active tab index if restore tabs is enabled
2024-03-06 19:46:19 +08:00
leo
f00ecbd0a1
fix: should not use Active to close a running popup.
2024-03-05 17:16:33 +08:00
leo
60e664ab26
optimize<*>: use custom view locator instead of ContentControl.DataTemplates to avoid memory leak.
2024-03-02 23:34:32 +08:00
leo
27d4dd5f64
style<*>: remove unused usings
2024-03-02 22:06:47 +08:00
leo
307e5a5ef0
fix<Repository, History>: wrong context menu IsEnabled state.
...
* 'Pull' should always enabled for local branch with remote upstream
* 'Discard All Changes' for current branch should only be enabled when there's at least one changes
* 'Fast Forward' should check if target local branch has any commit ahead of it's upstream
2024-03-01 19:12:22 +08:00
leo
7b70951c93
style<Launcher>: supports two size rules for tabs in titlebar - fixed width or size to content
2024-03-01 14:09:39 +08:00
leo
e3a7abe776
style<Repository>: normalize repository's path
2024-03-01 13:46:00 +08:00
leo
1c005983c7
fix<Discard>: wrong discard behavior with changes both in worktree and staged
2024-03-01 11:34:32 +08:00
