如何从拉取请求的功能分支中删除特定于操作系统的提交？

Question

I'm working on a branch Feature based off branch Ubuntu-Env where some changes are made for me working with Ubuntu. These changes have to be deleted when I make a Pull Request. Until now I just checkout the changed files from master. Is there a more elegant way? I tried git rebase but the commits from Ubuntu-Env are still there.

Answer 1

Your commit history probably looks something like this:

*--*--*--* [master]
 \
  A--B [Ubuntu-Env]
      \
       *--*--*--* [Feature]

And you want to open a pull request to master from Feature that doesn't contain commits A or B .

You are on the right track with git rebase . However, you need to include the --onto argument:

git rebase --onto master Ubuntu-Env Feature

Your history will then look something like this:

*--*--*--* [master]
 \        \
  \        *--*--*--* [Feature]
   \
    A--B [Ubuntu-Env]