- Remove `ConfigureAwait(false)` since we need go back to UIThread
- Add Chinese translations for `Text.CommitCM.CopyCommitMessage`
Signed-off-by: leo <longshuang@msn.cn>
- Add clickable version badge with GitHub release link in About view.
- Add GitHub version release link handler to open browser with specific release tag.
- `OpenForDiffAsync` should not use `await` (we do not need to wait it ends)
- Modify `Checkout`, `CheckoutCommit` and `CreateBranch`
Signed-off-by: leo <longshuang@msn.cn>
- "Integrationen" is more common and modern than "Einbindungen"
- Replaced the word "Graph" with "Verlauf" because for the users it is quite synonymous
- Aligned issue tracker samples wording
- Use the more direct translation "System-Prompt" as it is a recognized term in German developer slang
- Aligned the use of words if similar words are used already or the context uses another word for the same thing
- Some grammar fixes
- Remove all synchronous method in commands
- `Command.ReadToEndAsync` now is protected method
- Rename `ResultAsync` to `GetResultAsync`
- Call `ConfigureAwait(false)` when there's no context
Signed-off-by: leo <longshuang@msn.cn>
- returns `null` to fallback to git's `merge.ff` configure when user does not configure `Preferred Merge Mode`
- since `GetGitConfigBranchMergeOptions` is the last one, returns `Default` as fallback
Signed-off-by: leo <longshuang@msn.cn>
After changing the priority of the preferences/configurations for the
merge mode in #1495, the git configuration `merge.ff` was ignored. The
reason is, that `GetSettingsPreferredMergeMode()` does not return `null`
in the default case. This is now fixed.
This adds another configuration possibility for the default merge mode
to the already existing per branch git configuration
`branch.<name>.mergeoptions` (#540) and the per repo preference
"Preferred Merge Mode" (#1156).
Defined values:
- `false`: do no fast-forward merge
- `only`: do only a fast-forward merge
This is configurable by for example `git config set --global merge.ff
<value>` for a global (meaning the current user) configuration.
The priority between these configurations/preferences is:
- git configuration `branch.<name>.mergeoptions` (#540)
- git configuration `merge.ff`
- preference "Preferred Merge Mode" (#1156)
