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

Allow pasting commits onto branch from branches view #3288

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

nhAnik
Copy link

@nhAnik nhAnik commented Jan 31, 2024

  • PR Description
    Adds support for pasting commits from branches view by pressing 'V'.
    This will:
  • check if changes need to be stashed, and if so, prompt the user whether they want to stash the changes
  • check out the branch
  • paste the commits

This also works while pasting commits in the sub-commits view.

Addresses #3275.

  • Please check if the PR fulfills these requirements
  • Cheatsheets are up-to-date (run go generate ./...)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • Docs (specifically docs/Config.md) have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

Adds support for pasting commits from branches view by pressing 'V'.
This will:
- check if changes need to be stashed, and if so, prompt the user
whether they want to stash the changes
- check out the branch
- paste the commits
This also works while pasting commits in the sub-commits view.
SelectNextItem().
Press(keys.Commits.PasteCommits).
Tap(func() {
// cherry-picked commits will be deleted after confirmation
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does it mean that they will be deleted after confirmation?

Is that referring to the selection, that it will be cleared or am I missing something?

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.

None yet

2 participants