title: how to skip a particular file from rebasing
body: <p>I am using <code>git pull origin develop --rebase</code> to rebase my commits of some other branch say X (other than develop) locally. But while rebasing (some 11 commits of X branch on top of origin/develop), while solving conflicts, I come across solving <code>bundle.min.js</code> file as well, which is practically impossible to solve manually.
  I am using <code>git rebase --skip</code> for skipping that commit but it will remove other file changes (other than the bundle file) as well.
  Any workaround to just skip changes bundle.min.js file while rebasing?</p>