Partial squash-merge

I’d like to merge my feature-branch into my develop-branch, but squash some commits into 1, while pulling in others as-is.
Is there a possibilty to git merge --squash feature and then to choose which commits from the feature-branch should be squashed and which taken as-is?

  • git doesn't see a file… how to understand what's wrong?
  • Git pull: error: Entry foo not uptodate. Cannot merge
  • How to handle gitpython clone exceptions?
  • How Can I Get My Play! 2.0 Application to Automatically Compile Protocol Buffers?
  • Docker - Gitlab container. SSH git login error
  • Fix git history with duplicate commits
  • Compatibility of EGit - or are there alternatives?
  • How to handle a large git repository?
  • unable to look up https fatal error when push to git repository
  • What is the best way to store Symfony project on github?
  • Difference between downloaded Odoo 8.0 from a normal Download to a Git Clone Odoo 8
  • How to compare files from two different branches?
  • One Solution collect form web for “Partial squash-merge”

    Nah. You must use interactive rebase in order to do pick, delete, squash etc.

    git rebase -i HEAD~4

    Will let you decide on the four last commits.

    Git Baby is a git and github fan, let's start git clone.