Which is it?It's not so hard, really. Use which, plus commas, when you want to introduce material that isn't necessary for the sentence to make sense.
Whiskey, which I happen to enjoy, is an ancient drink. The stuff between the commas is additional, parenthetical, nonessential to the sentence's main thrust: Whiskey is an ancient drink.
But consider this:
The whiskey that I love comes from Scotland. The sentence implies that, of all the whiskies, I love Scotch best. That is essential to the meaning of the sentence. Grammarians call the clauses that follow that restrictive or essential, and you can see why.
Think you've got it? Then tell me the difference in meaning between these two sentences:
The lawnmower, which is in the garage, is broken.
The lawnmover that is in the garage is broken.



