Extracting branch into another under TortoiseGit
<p>Working under TortoiseGit (on Windows 7), imagine having a MASTER branch from which a SPECIFIC branch has been built. </p>

<p>The SPECIFIC contains some <em>parameter</em> changes and some general <em>code</em> changes. </p>

<h2>My Question</h2>

<p><em>How do I create a new branch (starting from the MASTER) which keeps the code changes only?</em> </p>

<p>(Of course, I will sort out what exactly is a code change and will be kept. )</p>

<h2>What I've tried</h2>

<p>So, I created the NEW branch from MASTER, and tried to rebase SPECIFIC onto NEW. All that allows me to do, is do a fast forward merge which is not very interesting. </p>

<p>I sought inspiration from <a href="https://www.atlassian.com/git/tutorial/rewriting-git-history%23!rebase" rel="nofollow noreferrer">rewrite Git history</a> but I don't see how to get the equivalent to <code>git rebase -i</code> in the TortoiseGit interface. I also looked in the <a href="https://tortoisegit.org/docs/tortoisegit/tgit-dug-rebase.html" rel="nofollow noreferrer">TortoiseGit manual</a> which correctly tells me that rebase is quite complex.</p>

<p>Conceptually, what I really want to do is to <code>diff</code> SPECIFIC and NEW, and manually sort out the differences. </p>

<p>Even better, NEW could end up being identical SPECIFIC but consisting of exactly two commits: the code changes and the parameter changes.</p>

<p>Any</p>