Skip to content

Conversation

@Sathiyaraman-M
Copy link

@Sathiyaraman-M Sathiyaraman-M commented Oct 24, 2025

  • Adds a new action git::PullRebase which adds --rebase in the final command invoked by existing Git-Pull implementation.
  • Includes the new action in "Fetch/Push" button in the Git Panel (screenshot below)
  • Adds key-binding for git::PullRebase in all three platforms, following the existing key-binding patterns (ctrl-g shift-down)
  • Update git docs to include the new action.

Sidenote: This is my first ever OSS contribution

Screenshot:

image

Release Notes:

  • Git: Added git: pull rebase for running git pull --rebase.

@cla-bot
Copy link

cla-bot bot commented Oct 24, 2025

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'.

@Sathiyaraman-M
Copy link
Author

@cla-bot check

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Oct 24, 2025
@cla-bot
Copy link

cla-bot bot commented Oct 24, 2025

The cla-bot has been summoned, and re-checked this pull request!

Copy link
Member

@cole-miller cole-miller left a 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" })
Copy link
Member

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla-signed The user has signed the Contributor License Agreement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants