Skip to content

Commit 91a884b

Browse files
committed
Merge upstream/develop and resolve display mode conflicts
Preserve per-view display and sort settings while adopting current selection bindings and change panel styling. Keep separate staged and unstaged switchers in their toolbars.
2 parents 4a8424e + 6ad3c8a commit 91a884b

258 files changed

Lines changed: 19813 additions & 5167 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.

‎README.md‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ You can download the latest stable from [Releases](https://github.com/sourcegit-
7272

7373
This software creates a folder, which is platform-dependent, to store user settings, downloaded avatars and crash logs.
7474

75-
| OS | PATH |
76-
|---------|-------------------------------------------|
77-
| Windows | `%APPDATA%\SourceGit` |
78-
| Linux | `~/.sourcegit` |
79-
| macOS | `~/Library/Application Support/SourceGit` |
75+
| OS | PATH |
76+
|---------|--------------------------------------------------------------------------------------------------|
77+
| Windows | `%APPDATA%\SourceGit` |
78+
| Linux | `${XDG_CONFIG_HOME}/SourceGit` (preference.json) `${XDG_CACHE_HOME}/SourceGit` (avatars & logs) |
79+
| macOS | `~/Library/Application Support/SourceGit` |
8080

8181
> [!TIP]
8282
> * You can open this data storage directory from the main menu `Open Data Storage Directory`.
@@ -163,6 +163,14 @@ For **Linux** users:
163163
sudo apt install sourcegit
164164
```
165165

166+
* `AOSC OS`: In addition to AMD64 and ARM64, support for LoongArch and RISC-V has been added.
167+
```shell
168+
sudo oma install sourcegit
169+
```
170+
171+
> [!NOTE]
172+
> RISC-V support is untested.
173+
166174
* `AppImage` files can be found on [AppImage hub](https://appimage.github.io/SourceGit/), `xdg-open` (`xdg-utils`) must be installed to support open native file manager.
167175
* Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) or [git-credential-libsecret](https://pkgs.org/search/?q=git-credential-libsecret) is installed on your Linux.
168176
* Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI.
@@ -186,6 +194,12 @@ For `OpenAI`:
186194

187195
* `Server` must be `https://api.openai.com/v1`
188196

197+
For `OrcaRouter`:
198+
199+
* `Server` should be `https://api.orcarouter.ai/v1`
200+
* `API Key` should be an OrcaRouter API key (prefixed with `sk-orca-`)
201+
* A good starting `Model` is `orcarouter/auto`, which routes each request to the best available model
202+
189203
For other AI service:
190204

191205
* The `Server` should fill in a URL equivalent to OpenAI's `https://api.openai.com/v1`. For example, when using `Ollama`, it should be `http://localhost:11434/v1` instead of `http://localhost:11434/api/generate`
@@ -207,7 +221,7 @@ This app supports open repository in external tools listed in the table below.
207221

208222
> [!NOTE]
209223
> This app will try to find those tools based on some pre-defined or expected locations automatically. If you are using one portable version of these tools, it will not be detected by this app.
210-
> To solve this problem you can add a file named `external_editors.json` in app data storage directory and provide the path directly.
224+
> To solve this problem you can add a file named `external_editors.json` in app data storage directory (config dir for Linux) and provide the path directly.
211225
> User can also exclude some editors by using `external_editors.json`.
212226
213227
The format of `external_editors.json`:

‎THIRD-PARTY-LICENSES.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,3 +112,38 @@ The project uses the following third-party libraries or assets
112112
- **Commit**: 68d98dc57f8486c2946ae28dc86bf8e91d45da4d
113113
- **License**: MIT License
114114
- **License Link**: https://github.com/vuejs/language-tools/blob/68d98dc57f8486c2946ae28dc86bf8e91d45da4d/LICENSE
115+
116+
### OCaml
117+
118+
- **Source**: https://github.com/shentao/vue-multiselect/blob/master/docs/shiki/languages/ocaml.tmLanguage.json
119+
- **Commit**: 8092917041f0ae02cbe4c6982deddc931c6adecd
120+
- **License**: MIT License
121+
- **License Link**: https://github.com/shentao/vue-multiselect/blob/master/LICENSE
122+
123+
### OCamllex
124+
125+
- **Source**: https://github.com/textmate/ocaml.tmbundle/blob/master/Syntaxes/OCamllex.tmLanguage
126+
- **Commit**: 1eff26848b39368414cb4214183a2cba22f12d0e
127+
- **License**: Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose.
128+
- **License Link**: https://github.com/textmate/ocaml.tmbundle/tree/master#license
129+
130+
### OCamlyacc
131+
132+
- **Source**: https://github.com/textmate/ocaml.tmbundle/blob/master/Syntaxes/OCamlyacc.tmLanguage
133+
- **Commit**: 08a892aef6a4b285b1902d9ed1427653fce53e31
134+
- **License**: Permission to copy, use, modify, sell and distribute this software is granted. This software is provided "as is" without express or implied warranty, and with no claim as to its suitability for any purpose.
135+
- **License Link**: https://github.com/textmate/ocaml.tmbundle/tree/master#license
136+
137+
### Erlang
138+
139+
- **Source**: https://github.com/shentao/vue-multiselect/blob/master/docs/shiki/languages/erlang.tmLanguage.json
140+
- **Commit**: 8092917041f0ae02cbe4c6982deddc931c6adecd
141+
- **License**: MIT License
142+
- **License Link**: https://github.com/shentao/vue-multiselect/blob/master/LICENSE
143+
144+
### Swift
145+
146+
- **Source**: https://github.com/jtbandes/swift-tmlanguage/blob/main/Swift.tmLanguage.json
147+
- **Commit**: abda279b567a0a7f35f81642c1b830f437f718d9
148+
- **License**: MIT License
149+
- **License Link**: https://github.com/jtbandes/swift-tmlanguage/blob/main/LICENSE.md

0 commit comments

Comments
 (0)