You would want to move file changes out of the newest commit normally if you are rebasing a stock kernel onto a caf tag. This allows you split changes to drivers and such into their own commit out of the big import commit so you can then more easily see what changes were done.


<pre>

<code>

git reset HEAD^ directory/to/split/out

git commit —amend

git add directory/to/split/out

git commit

</code>

</pre>


Then you will need to move the big import commit back to be the newest commit.


<pre>

<code>

git rebase -i HEAD~2

</code>

</pre>

Do ctrl + k on the first line to cut it

Then make a new empty line and do ctrl + u to paste it

Then exit the editor