-
Couldn't load subscription status.
- Fork 5.7k
git: Add support for git pull with rebase #41117
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
base: main
Are you sure you want to change the base?
git: Add support for git pull with rebase #41117
Conversation
|
We require contributors to sign our Contributor License Agreement, and we don't have @Sathiyaraman-M on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'. |
|
@cla-bot check |
|
The cla-bot has been summoned, and re-checked this pull request! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, one piece of feedback but seems good otherwise!
| .envs(env.iter()) | ||
| .current_dir(&working_directory?) | ||
| .args(["pull"]) | ||
| .arg(if rebase { "--rebase" } else { "--no-rebase" }) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we shouldn't pass --no-rebase if rebase is false here, so you get the configured behavior for the branch (which might be either merge or rebase)--this is how git::Pull works in Zed now and we should maintain that behavior.
git::PullRebasewhich adds--rebasein the final command invoked by existing Git-Pull implementation.git::PullRebasein all three platforms, following the existing key-binding patterns (ctrl-g shift-down)Sidenote: This is my first ever OSS contribution
Screenshot:
Release Notes:
git: pull rebasefor runninggit pull --rebase.