stasm

There is history and there is cleanness, as Linus Torvalds explained in http://lwn.net/Articles/328438/.

The git way of doing what the OP wants to do is to develop all code on local branches. They're cheap and you can have as many of them as you want.

Just never commit directly to master and set it to track upstream/master. Synchronize with upstream by pulling into your local master, and then rebase, merge & diff your local branches at will.

It looks like what you're really looking for is a local branch that you never push to the remote, and 'git diff master...' with 'git rebase'.

Create a local branch, apply the sledgehammer, and start reviewing changes. Use 'git diff master...' to review changes. (This is short for 'git diff master...HEAD' which in turn stands for 'compare current branch's HEAD with the commit on master off of which you've branched.) 'git add -p' and commit changes that you like.

Iterate until you're happy with the result. You will have ended up with a few commits on your local branch. Use 'git rebase -i master' to squash all commit in a single one. Finally, check out the master branch and merge your local branch in, preferably with --ff.

The engineers were good (if not too good, it all still stands...), but they were limited by the ideology. The city planning and the architecture were at the ideology's service. For instance, rarely did buildings have ground-level spaces for commerce and services; after all, any form of entrepreneurship was discouraged by the economic system, so there was no official need for cafes at every corner. The streets were made wide to allow for easy troops transfer and make it harder for any rebels to create barricades. Some streets were shifted by a few meters to obscure a view of churches and other historic landmarks which could provoke unrighteous thinking.

I heartily recommend Ryszard Kapuscinski's 'Imperium' (it's available in English) if you want to learn more about the Soviet Union in general and different cultures inhabiting it at the time. A lot of spot-on analysis of how the system worked. Brilliant documentary writing, too.

It looks OK, but it's not for a single reason: who is "I" in this sentence? This is enough to confuse most of the users.

It's 'the Web', i.e. a set of HTML pages with some CSS and JS, with access to a few newly developed APIs, like the one for dialing the phone, but running locally on the device, not remotely.

My thoughts exactly. You can't force a privately-owned company to sell you the product the way you want it to be sold. It's their right to make money the way they see fit, and if they decide it's okay for them to lose some of the clientele over DRM, it's their choice.

Piracy in the name of protesting against DRM is borderline hypocrisy. As others already said, morality is subjective, but here are two other ways I'd personally support :

- don't use the product,

- pay for the license, pirate the product, get it touch with the company to explain your problem to them.

The logistics of the update are being discussed in https://groups.google.com/forum/#!topic/mozilla.dev.planning..., with the current proposal available at https://wiki.mozilla.org/MPL_Upgrade.

One idea is to update the codebase at the beginning of the cycle that will end up being released as Firefox 13.