Both x-rays and gamma rays involve high energy transitions. X-rays involve electronic transitions of electrons near the nucleus of an atom. Gamma rays involve transitions of nucleons within a nucleus.

Wikipedia on X-ray.

X-ray production.