Re: [Mingw-cross-env-list] Documentation (was Re: libssh2 update to version 1.4.1)

[Moritz Bunkus]

Hey,

there are tons of ways to handle local changes with git (always
rebasing against upstream's master; only merging upstream's changes;
even stashing before merging). Stashing is the worst solution because
it always leaves your working tree dirty, accumulates local changes
that are otherwise unrelated and is way too much work.

If you never plan on pushing those up then the easiest way is to
simply commit them to your local "master" branch. "git pull" will then
merge the upstream changes with your local changes and only touch
gcc.mk if it has actually changed upstream.

m.