A.
Traditionally "which" has been used to introduce nonessential clauses:
The job, which I held for a year, didn't pay very well.
"That" is used for essential clauses:
The knowledge that he has is amazing.
However, that rule is getting a little looser, and it is acceptable to use either "that" or "which" to introduce essential clauses.