github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-25 03:12:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,091 Commits 3 Branches 160 Tags
a229a19b2ec14865e1361683500623bb6ad08b56
Commit Graph

4091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan Baulch
a229a19b2e fix: discard null process output data (#1571) 2025-07-14 10:03:43 +08:00
leo
6ae8c7c759 code_style: move class extensions to App.Extensions.cs to use these extensions anywhere 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 18:00:21 +08:00
Nathan Baulch
9c039215cf fix: escape double quotes in quoted git command strings (#1559) 2025-07-11 15:53:42 +08:00
leo
bfd639c001 enhance: external merge tool can only used for both-added or both-modified conflict(s) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 14:22:08 +08:00
Sina Hinderks
c60a2de324 ux: add hotkey for OPEN EXTERNAL MERGETOOL button (#1558) 
When opening the context menu for a conflicted file in the unstaged
view, the displayed hotkey (Ctrl+Shift+D/⌘+⇧+D, added in #1547) for
opening the merge tool is working now.
 2025-07-11 14:15:00 +08:00
leo
b1efd6527c feature: allows to reword HEAD commit while keeping local changes 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 14:09:41 +08:00
leo
943a4ebfd4 code_review: PR #1556 
New layout for interactive rebase window

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 13:36:30 +08:00
github-actions[bot]
a21d4fdf21 doc: Update translation status and sort locale files 2025-07-11 05:27:19 +00:00
Nathan Baulch
3f5f74d7ae enhance: support --autostash on interactive rebase (#1556) 2025-07-11 13:27:07 +08:00
github-actions[bot]
7974bcaa70 doc: Update translation status and sort locale files 2025-07-11 04:28:33 +00:00
leo
8f6651119b code_review: PR #1535 
- Do not translate interactive rebase action description.
- For slider label in `BLEND` diff mode, it can not use `Text.Diff.Binary.New` or `Text.Diff.Binary.Old`. Because those keys are labels for size.

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 12:27:43 +08:00
github-actions[bot]
14bea8e00a doc: Update translation status and sort locale files 2025-07-11 03:42:05 +00:00
Nathan Baulch
1d31f5f294 localization: move strings into resources (#1535) 2025-07-11 11:41:51 +08:00
leo
58e63b9b57 enhance: use different icon for Visual Studio Preview 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 11:18:53 +08:00
leo
b95523aa0d feature: detect Visual Studio Preview as external tools (#1553) 
Co-authored-by: Luis Frey <58328398+FreyLuis@users.noreply.github.com>
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 11:05:49 +08:00
leo
8f9094fc77 fix: should use File.Create instead of File.OpenWrite 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 10:39:33 +08:00
leo
aa803c3141 code_review: PR #1555 
- Remove unnecessary reference to `System.Linq`
- Stop to auto-stage and commit when there is unsolved conflict(s)

Signed-off-by: leo <longshuang@msn.cn>
 2025-07-11 09:59:19 +08:00
Sina Hinderks
7aa008372b fix: prevent staging conflicted files (#1555) 
It was possible to stage a file with conflicts (double tap, space,
enter, or a stage button).  As a result it would no longer be shown as
conflicted, and the user could no longer solve the conflict in any way
(use theirs, use mine, or execute merge tool), not even after unstaging
again.

Now conflicted files are ignored when staging.
 2025-07-11 09:43:49 +08:00
github-actions[bot]
862fe40b56 doc: Update translation status and sort locale files 2025-07-11 01:40:33 +00:00
AquariusStar
e998f78f3a localization: update russian translate (#1554) 2025-07-11 09:40:20 +08:00
leo
d5745b4a65 enhance: do nothing if target is a binary file while blaming 2025-07-10 17:42:18 +08:00
Gadfly
44f7877926 feat: Add blame visibility condition and file size formatting (#1552) 
- Add conditional visibility binding to blame data display using a negated binary file flag converter.
- Format size property as human-readable file size using LongConverters.ToFileSize converter in UI display.
 2025-07-10 17:37:14 +08:00
leo
24d3998808 ux: add loading icon 2025-07-10 17:34:15 +08:00
leo
de0d0c15f8 enhance: it's not necessary to change thread's culture 2025-07-10 16:11:02 +08:00
leo
cc0a223f50 enhance: use G3 instead of N3 to format file size in double 2025-07-10 13:15:03 +08:00
leo
a687de36da ux: format file size based on current culture 2025-07-10 11:49:12 +08:00
leo
d3d1377334 refactor: auto-select merge mode 
- Change the description of `Default` merge mode to `Use git configuration`
- It's not necessary to read global `merge.ff` configuration
 2025-07-09 17:25:06 +08:00
leo
7b0292722e enhance: do not show end of line any more since we can not restore the original line-endings 2025-07-09 16:47:50 +08:00
leo
8bdc1c5976 code_style: a few more to PR #1543 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-09 16:37:12 +08:00
Nathan Baulch
796f8898c9 code_style: general cleanup (#1543) 
* code_style: general cleanup

* feedback fixes
 2025-07-09 16:12:03 +08:00
leo
666305e40c ux: file history layout 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-09 15:59:43 +08:00
leo
af7e68b3db ux: use the same tooltip style for submodule when displaying as tree 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-09 15:18:04 +08:00
leo
f6b0f14106 ux: style for filter mode switcher in graph 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-09 14:27:08 +08:00
leo
7c59183391 feature: add hotkeys to stashes page 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-09 12:57:11 +08:00
Nathan Baulch
23e578f355 enhance: double tap stash to apply (#1546) 2025-07-09 12:02:26 +08:00
github-actions[bot]
4b05cf15bf doc: Update translation status and sort locale files 2025-07-09 03:46:47 +00:00
leo
58678e88e4 ux: styles for hotkey tips 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-09 11:46:12 +08:00
leo
094749f935 refactor: use Ctrl+Shift+S to save revision file 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-08 21:33:03 +08:00
github-actions[bot]
4daa0f00d3 doc: Update translation status and sort locale files 2025-07-08 12:56:18 +00:00
leo
3c5abc525a feature!: change hotkey for COMMIT & PUSH to Ctrl+Alt+Enter/⌘+⌥+Enter 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-08 20:55:42 +08:00
leo
0eaa7d35ff feature: add hotkeys to save revision file 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-08 20:25:21 +08:00
leo
7f838f1f88 feature: add hotkeys to open file with default editor 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-08 20:05:37 +08:00
leo
7fa1912721 fix: hotkeys not work in change list (INFORMATION page) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-08 18:06:11 +08:00
leo
92fb4c8625 feature: add hotkeys to copy file path 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-08 17:54:15 +08:00
Nathan Baulch
f2778ee07a ux: hotkey tag on external merger menu items (#1547) 2025-07-08 16:30:49 +08:00
leo
170308e84f code_review: PR #1541 
Signed-off-by: leo <longshuang@msn.cn>
 2025-07-08 14:36:55 +08:00
oikku
4ef3ed8740 enhance: supports to open Blame (HEAD only) from LOCAL CHANGES (#1541) 2025-07-08 14:15:50 +08:00
github-actions[bot]
85559cdc41 doc: Update translation status and sort locale files 2025-07-08 05:27:49 +00:00
Nathan Baulch
e70010b57e localization: remove unused translations (#1545) 2025-07-08 13:27:36 +08:00
Nathan Baulch
aa3c0605c3 ux: inconsistent tabs/pages terminology (#1536) 2025-07-08 11:56:44 +08:00