3677 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
github-actions[bot]	38d67d7f17	doc: Update translation status and sort locale files	2025-05-23 03:28:10 +00:00
leo	76a197aae7	feature: supports to overwrite existing branch while creating new branch (#1349) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 11:27:45 +08:00
leo	594ffc0d1a	localization: fix typo in en_US for Text.DeinitSubmodule.Force ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:38:44 +08:00
leo	fb1f5638ce	code_style: simpfy context menu creation for blame editor ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:31:11 +08:00
leo	492da8dd57	fix: blame highlight background did not update when using scrollbar (#1354) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:27:48 +08:00
leo	0ae39faad1	enhance: do not show hint: messages in error popup, but leave it in git command logs (#1348) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-23 10:05:09 +08:00
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
Göran W	9fb8af51ff	code_style: move hardcoded brush/strings (for outlier Conflict-icon) into named constants (#1350) ... This makes code more consistent and gives better overview of all the icons. (Potentially, this special/outlier icon could be moved into the existing arrays as an extra ChangeState enum-value.)	2025-05-23 09:18:05 +08:00
leo	1ee7d1184e	enhance: only refresh submodules when it is needed (#1344) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-22 11:02:54 +08:00
Göran W	44c83ef342	enhance: added more FileSystemWatcher patterns, to improve handling (#1345) ... Skip files frequently updated by Git fsmonitor--daemon and Visual Studio, to ease debugging and for early exit. Check for HEAD and ORIG_HEAD under .git/modules/<submodule>/, to improve handling of submodules. Check for MERGE_HEAD and AUTO_MERGE under .git/, to improve handling of submodules.	2025-05-22 09:11:28 +08:00
leo	c3ac59ee1a	enhance: refresh submodules after .gitmodules file changed ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 20:51:29 +08:00
leo	c73f775aa5	enhance: mark submodule having local changes even if there are only untracked files (#1344) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 20:47:10 +08:00
M-L-Ml	afbd0d7135	fix: typo in name SetupExternalTools (#1343)	2025-05-21 20:35:22 +08:00
github-actions[bot]	bf39673b21	doc: Update translation status and sort locale files	2025-05-21 12:34:51 +00:00
leo	b0c0c46441	feature: supports to de-initialize a submodule (#1272) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 20:34:33 +08:00
leo	1fef7a7baa	perf: only update uninited or outdated submodules ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 17:51:00 +08:00
github-actions[bot]	1872740265	doc: Update translation status and sort locale files	2025-05-21 09:18:49 +00:00
leo	09d0122e26	refactor: rewrite git pull command ... If we do not provide pulling remote branch, it will auto fetch all branches first. Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 17:18:25 +08:00
github-actions[bot]	7728f4ffbf	doc: Update translation status and sort locale files	2025-05-21 08:54:46 +00:00
leo	936160ea5c	feature: supports --recurse-submodules on pull (#1342) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 16:54:23 +08:00
leo	d73ae83b01	feature: supports to use relative path in remote URL (#1339) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 16:29:33 +08:00
leo	5e05c008fc	refactor: simplfy the regex to check remote's URL with HTTP/HTTPS/GIT protocol ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 15:09:36 +08:00
leo	598ba6d9f6	refactor: rewrite Remote.IsValidURL (#1339) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 14:48:21 +08:00
leo	3232e6f313	fix: on Windows, the correct file protocol url format is file:///<driver>:/path/to/file_or_dir (#1339) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 14:18:06 +08:00
leo	0a6b1faa65	feature: support git:// protocol (#1339) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 09:36:41 +08:00
leo	71b90a82b6	refactor: remove validation for relative path while adding submodule (#1339) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 09:27:02 +08:00
leo	d304c50e7f	enhance: show custom action output in popup ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 00:16:19 +08:00
leo	438aa76695	feature: support to use relative path as submodule's url when adding new submodule (#1339) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-21 00:10:10 +08:00
leo	ece51fbd32	fix: remove binding error in debug mode (#1338) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 23:02:45 +08:00
leo	224f7a949a	fix: since ⌥ can not been used in HotKey property and ⌘+⌥+D has been used to show Dock, change the hotkey to open external merge tool to Ctrl+Shift+D/⌘+⇧+D ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 23:01:21 +08:00
leo	e6fdc778b7	fix: remove binding error in debug mode (#1338) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 21:48:58 +08:00
leo	53c6fc8999	fix: remove binding error in debug mode (#1338) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 21:44:28 +08:00
leo	f0d1d460a9	fix: remove binding error in debug mode (#1338) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 21:35:14 +08:00
leo	3386cb177b	refactor: rewrite git flow init ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 21:26:41 +08:00
leo	4d5be9f280	refactor: rewrite git-flow integration ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 21:08:00 +08:00
leo	6fa454ace8	fix!: same hotkey for opening external diff tool and discard block (#1337) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 17:32:06 +08:00
leo	75b7724d44	refactor: implement IDisposable instead of calling custom Cleanup ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 17:24:00 +08:00
leo	550493b572	enhance: prevent requesting worktree files more than once time ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 16:49:00 +08:00
leo	eb183589f5	enhance: prevent requesting revision files more than once time ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 16:32:57 +08:00
github-actions[bot]	d56c6a5030	doc: Update translation status and sort locale files	2025-05-20 04:24:40 +00:00
leo	f9b6116a76	feature: supports reset branch to selected commit without checkout (#1247) (#1318) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 12:24:07 +08:00
Gadfly	12d2b7721c	fix: Trim and normalize commit message history line endings (#1335)	2025-05-20 10:56:02 +08:00
leo	119b0fe95c	feature: log output of custom action if Wait for action exit enabled (#1334) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-20 09:17:00 +08:00
github-actions[bot]	1dfb629cef	doc: Update translation status and sort locale files	2025-05-19 04:22:07 +00:00
leo	0e2bb1b276	feature: show commit changes count (#1306) ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-19 12:21:50 +08:00
leo	57ee1f7dbd	fix: wrong hotkey tip for open Preferences window ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-19 10:55:25 +08:00
leo	aaf53ac694	enhance: try to cancel switcher first then other popup ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-19 10:08:37 +08:00
leo	736991198f	Merge branch 'master' into develop	2025-05-19 09:45:11 +08:00
leo	7dd1389c25	Merge branch 'release/v2025.18'	2025-05-19 09:43:59 +08:00
leo	341ac26576	version: Release 2025.18 ... Signed-off-by: leo <longshuang@msn.cn>	2025-05-19 09:43:48 +08:00