Julia Ryan
ebb39d9231
The ideal solution here would be the ability to pick a default remote the first time you click on a PR or commit link from a blame, and then store that state in the repo or project and allow you to change it somehow. Because that's complicated, and because the vast majority of users follow the convention of using `upstream` and `origin`, this change just adds `upstream` as a possible remote that takes precedence for generating links. I've sometimes seen `origin` and `fork` used for the same purposes, which will still work fine with this change. Here are some sources recommending the `upstream`/`origin` convention: - https://www.atlassian.com/git/tutorials/comparing-workflows/forking-workflow - https://github.blog/open-source/git/git-2-5-including-multiple-worktrees-and-triangular-workflows/ - https://cli.github.com/manual/gh_repo_fork The fact that the github cli renames them to those when you `gh repo fork` is pretty strong evidence that it's worth supporting them even if users can set arbitrary remote names or could actually want to open a PR link on their fork. Resolves #13511 Release Notes: - Git blame links now prefer the `upstream` remote over `origin` if it exists.
Zed
Welcome to Zed, a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Installation
On macOS and Linux you can download Zed directly or install Zed via your local package manager.
Other platforms are not yet available:
- Windows (tracking issue)
- Web (tracking issue)
Developing Zed
- Building Zed for macOS
- Building Zed for Linux
- Building Zed for Windows
- Running Collaboration Locally
Contributing
See CONTRIBUTING.md for ways you can contribute to Zed.
Also... we're hiring! Check out our jobs page for open roles.
Licensing
License information for third party dependencies must be correctly provided for CI to pass.
We use cargo-about to automatically comply with open source licenses. If CI is failing, check the following:
- Is it showing a
no license specifiederror for a crate you've created? If so, addpublish = falseunder[package]in your crate's Cargo.toml. - Is the error
failed to satisfy license requirementsfor a dependency? If so, first determine what license the project has and whether this system is sufficient to comply with this license's requirements. If you're unsure, ask a lawyer. Once you've verified that this system is acceptable add the license's SPDX identifier to theacceptedarray inscript/licenses/zed-licenses.toml. - Is
cargo-aboutunable to find the license for a dependency? If so, add a clarification field at the end ofscript/licenses/zed-licenses.toml, as specified in the cargo-about book.