Skip to content

Commit 4a8424e

Browse files
kreysCopilot
andcommitted
Merge upstream/develop into feature/display_modes
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
2 parents 8ea787e + 3cd815d commit 4a8424e

302 files changed

Lines changed: 12232 additions & 6165 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*.user
77
*.suo
88
*.code-workspace
9+
*.tss
910

1011
.DS_Store
1112
.DocumentRevisions-V100
@@ -43,3 +44,4 @@ build/*.AppImage
4344
SourceGit.app/
4445
build.command
4546
src/Properties/launchSettings.json
47+
*.lscache

‎README.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ Users can also launcher `SourceGit` from commandline. Usage:
174174

175175
```
176176
<SOURCEGIT_EXEC> <DIR> // Open repository in existing `SourceGit` instance or a new one
177-
<SOURCEGIT_EXEC> --file-history <FILE_PATH> // Launch `SourceGit` to see the history of a file
177+
<SOURCEGIT_EXEC> --history <FILE_OR_DIR> // Launch `SourceGit` to see the history of a file or dir
178178
<SOURCEGIT_EXEC> --blame <FILE_PATH> // Launch `SourceGit` to blame a file (HEAD version only)
179179
```
180180

@@ -251,6 +251,9 @@ You can define your own conventional commit types (per-repository) by following
251251

252252
Everyone is welcome to submit a PR. Please make sure your PR is based on the latest `develop` branch and the target branch of PR is `develop`.
253253

254+
This project has a submodule in `depends/AvaloniaEdit` which is a custom fork of [Official AvaloniaEdit](https://github.com/AvaloniaUI/AvaloniaEdit).
255+
Please make sure it is initialized - enable `--recurse-submodules` option while cloning or run `git submodule update --init` after cloned.
256+
254257
In short, here are the commands to get started once [.NET tools are installed](https://dotnet.microsoft.com/en-us/download):
255258

256259
```sh

‎THIRD-PARTY-LICENSES.md‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,25 @@ The project uses the following third-party libraries or assets
77
### AvaloniaUI
88

99
- **Source**: https://github.com/AvaloniaUI/Avalonia
10-
- **Version**: 11.3.13
10+
- **Version**: 12.0.5
1111
- **License**: MIT License
1212
- **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
1313

14+
### Avalonia.Controls.DataGrid
15+
16+
- **Source**: https://github.com/AvaloniaUI/Avalonia.Controls.DataGrid
17+
- **Version**: 12.0.1
18+
- **License**: MIT License
19+
- **License Link**: https://github.com/AvaloniaUI/Avalonia.Controls.DataGrid/blob/master/licence.md
20+
1421
### AvaloniaEdit
1522

1623
- **Official Source**: https://github.com/AvaloniaUI/AvaloniaEdit
1724
- **Fork (Modified)**: https://github.com/love-linger/AvaloniaEdit
18-
- **Version**: 11.4.1
25+
- **Version**: Based on 12.0.x
1926
- **License**: MIT License
2027
- **License Link**: https://github.com/AvaloniaUI/AvaloniaEdit/blob/master/LICENSE
2128

22-
### LiveChartsCore.SkiaSharpView.Avalonia
23-
24-
- **Source**: https://github.com/beto-rodriguez/LiveCharts2
25-
- **Version**: 2.0.0
26-
- **License**: MIT License
27-
- **License Link**: https://github.com/beto-rodriguez/LiveCharts2/blob/master/LICENSE
28-
2929
### TextMateSharp
3030

3131
- **Source**: https://github.com/danipen/TextMateSharp
@@ -61,6 +61,12 @@ The project uses the following third-party libraries or assets
6161
- **License**: MIT License
6262
- **License Link**: https://github.com/nickbabcock/Pfim/blob/master/LICENSE.txt
6363

64+
### StbImageSharp
65+
66+
- **Source**: https://github.com/StbSharp/StbImageSharp
67+
- **Version**: 2.30.15
68+
- **License**: Public Domain
69+
6470
## Fonts
6571

6672
### JetBrainsMono

0 commit comments

Comments
 (0)