On Sat, Nov 12, 2016 at 12:39 PM, Vincent Habchi <[email protected]> wrote:
> I have a private version of the llvm-3.9/Portfile (I just narrowed down
> the targets to PowerPC and X86 rather than build everyone of them which
> squanders time). But now I can’t git pull —rebase, I get an error message.
>
> Of course I have no intention to commit that private patch. How can I make
> it ignored by git?
>
You can commit it, and in fact probably should. What you don't want to do
is *push* that commit.
If your git is new enough, you can enable auto-stashing so your change is
saved across the rebase.
git config --local --bool rebase.autostash true
If not, you can do it manually:
git stash
git pull --rebase
git stash pop
--
brandon s allbery kf8nh sine nomine associates
[email protected] [email protected]
unix, openafs, kerberos, infrastructure, xmonad http://sinenomine.net
