github-mirrors/sourcegit
1
0
Fork 0
mirror of https://fastgit.cc/github.com/sourcegit-scm/sourcegit synced 2026-04-25 11:24:02 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,748 Commits 3 Branches 160 Tags
75c32c1a0111626fa88f72bd5872810683be80b2
Commit Graph

818 Commits

Author SHA1 Message Date
Göran W
75c32c1a01 typo: corrected spelling error in App.GetLauncher() method 2025-06-05 21:15:28 +08:00
leo
a023a9259b refactor: rewrite lfs pointer detection and image loading 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-05 21:06:31 +08:00
leo
eebadd67a1 feature: remember the last active tab index in lfs-image diff view 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-05 09:18:19 +08:00
leo
ed496a41fb feature: supports to view image diff when lfs object points to a image 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-04 20:53:42 +08:00
leo
c2187edbe9 fix: running git command in UIThread via context menu entry blocks whole app (#1384) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-03 23:36:15 +08:00
leo
98041c803e feature: supports re-order custom actions (#1346) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-03 20:24:30 +08:00
leo
bf43dd828a ux: new style for ref's Visibility in Graph context menu item 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-03 12:34:49 +08:00
leo
cd009bda6b ux: enable Use monospace font only in text editor by default 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-03 10:15:58 +08:00
leo
6e501b1ee4 feature!: now SourceGit requires git >= 2.25.1 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-02 22:38:00 +08:00
leo
7b05b011aa fix: USE THEIRS for AU conflict and USE MINE for UA conflict 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-02 13:03:38 +08:00
leo
78f9ae2fa9 refactor: rewrite git restore integration 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-02 12:14:22 +08:00
leo
fa004ce31b enhance: unstaged renamed file should use git restore --staged <path> <org_path> instead of git restore --staged <path> 
Signed-off-by: leo <longshuang@msn.cn>
 2025-06-01 11:19:41 +08:00
leo
8b17f3b1f4 localization: change Compare with HEAD to Compare with <current_branch_name> 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-30 18:19:46 +08:00
leo
7934496cff feature: reset non-active branch to selected commit should not depends on upstream 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-30 17:56:06 +08:00
leo
bc5deac9fe fix: OpenFolderPickerAsync raise exception when selected a drive root such as E:\ 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-30 17:12:56 +08:00
leo
60cd210b80 fix: using theirs or mine does not work if it is deleted by ours or theirs 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-30 11:13:29 +08:00
leo
75015d550c ux: show conflict short format in changes view 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-30 10:42:02 +08:00
leo
e40ca4bbe0 refactor: use git restore instead of git reset to unstage local changes (#1373) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-30 09:43:45 +08:00
leo
46231a759c code_style: run dotnet format 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-28 15:17:05 +08:00
leo
fbc8edcc13 feature: show conflict reason 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-28 14:20:56 +08:00
leo
40bf69bff3 ux: move some buttons to page switcher (#1370) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-28 10:18:34 +08:00
leo
2aac6779a5 fix: squash should not change the original author 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-28 09:50:14 +08:00
Gadfly
729e06d5c0 fix: SaveAsPatch for untracked changes in stash (#1366) 2025-05-26 22:50:29 +08:00
leo
826619e7c9 fix: new added file in stash changes may not come from untracked file but from staged files (#1358) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-26 22:13:10 +08:00
leo
0641a22230 feature: allow to reset author when --amend is enabled for committing 2025-05-26 12:28:00 +08:00
leo
ac26d5bb06 fix: can not squash and fixup until first picked/edit/reword commit in interactive rebase exists list (#1362) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-25 13:46:27 +08:00
leo
0e35c56529 enhance: disable squash and fixup for the first commit in interactive rebase list (#1362) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-25 13:03:36 +08:00
leo
ef53dd0025 refactor: use a new Models.ChangeState.Conflicted to represent all the unmerged file state (#1359) 
Signed-off-by: leo <longshuang@msn.cn>
 2025-05-24 20:25:05 +08:00
Göran W
30d4c1008a enhance: don't show unmerged files in STAGED area (#1359) 
Unmerged files (i.e unresolved conflicts) should only appear in the Unstaged area, and not "duplicated" in the Staged area.

Motivation:
* The user-friendly git-status command does not show these as "Changes to be committed".
* If they appear in the Staged area, they are quite redundant since the Diff view will just show "No changes or only EOL changes".
* Some other Git UIs (like Fork) don't show these as Staged items either.

NOTE: According to docs for the git-status "Short Format" (and --porcelain=v1), the XY fields for Unmerged paths do NOT actually represent the Index & Working-tree states, instead they represent the states introduced by each HEAD in the merge (i.e Ours & Theirs, relative to Base).
 2025-05-24 19:42:10 +08:00
Göran W
4363b8b6aa refactor: add new constant Models.Commit.EmptyTreeSHA1 (#1360) 2025-05-24 19:23:28 +08:00
Göran W
f3fe90b2e1 fix: IsConflictResolved check should not be done for submodules (#1356) 
A submodule conflict is not resolved until it's Staged.
 2025-05-24 09:40:17 +08: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
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
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
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
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
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
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
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
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
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
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