Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream merge. #1

Merged
merged 298 commits into from
Jul 12, 2020
Merged

Upstream merge. #1

merged 298 commits into from
Jul 12, 2020

Conversation

ciaranmooney
Copy link
Owner

Upstream merge.

Stephan Dilly and others added 29 commits July 6, 2020 21:18
Pressing `e` while looking at a file in the _Status_ view will launch an external editor with the current file opened. The editor chosen is determined by the default logic introduced in #114.

An improvement to this in the future could be launching at the specific line at which the _Diff_ view is focused, but that seems to require a change in `FileDiff` which is a change bigger than this PR.

Fixes #166
Bumps [backtrace](https://github.com/rust-lang/backtrace-rs) from 0.3.49 to 0.3.50.
- [Release notes](https://github.com/rust-lang/backtrace-rs/releases)
- [Commits](rust-lang/backtrace-rs@0.3.49...0.3.50)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
*Total -- 6,791.98kb -> 3,275.88kb (51.77%)

/assets/newlines.gif -- 100.34kb -> 6.63kb (93.39%)
/assets/vi_support.gif -- 685.20kb -> 134.60kb (80.36%)
/assets/spinner.gif -- 267.20kb -> 60.63kb (77.31%)
/assets/cmdbar.gif -- 278.36kb -> 121.63kb (56.31%)
/assets/screenshots/s02-revert.png -- 944.00kb -> 420.81kb (55.42%)
/assets/binary_diff.png -- 63.88kb -> 31.17kb (51.2%)
/assets/screenshots/s03-commit.png -- 1,001.72kb -> 491.67kb (50.92%)
/assets/screenshots/s00-diff.png -- 1,034.90kb -> 510.97kb (50.63%)
/assets/light-theme.png -- 756.01kb -> 417.72kb (44.75%)
/assets/screenshots/s01-log.png -- 1,571.65kb -> 999.73kb (36.39%)
/assets/logo.png -- 25.07kb -> 18.21kb (27.36%)
/assets/perf_compare.jpg -- 63.63kb -> 62.10kb (2.4%)

Signed-off-by: ImgBotApp <ImgBotHelp@gmail.com>
@ciaranmooney ciaranmooney merged commit d445362 into ciaranmooney:master Jul 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.