We investigate the jamming transition in a quasi-2D granular material composed of regular pentagons or disks subjected to quasistatic uniaxial compression. We report six major findings based on experiments with monodisperse photoelastic particles with static friction coefficient ≈ 1. (1) For both pentagons and disks, the onset of rigidity occurs when the average coordination number of non-rattlers, Z nr , reaches 3, and the dependence of Z nr on the packing fraction changes again when Z nr reaches 4. (2) Though the packing fractions c1 and c2 at these transitions differ from run to run, for both shapes the data from all runs with different initial configurations collapses when plotted as a function of the non-rattler fraction. (3) The averaged values of c1 and c2 for pentagons are around 1% smaller than those for disks. (4) Both jammed pentagons and disks show Gamma distribution of the Voronoi cell area with same parameters. (5) The jammed pentagons have similar translational order for particle centers but slightly less orientational order for contacting pairs compared to jammed disks. (6) For jammed pentagons, the angle between edges at a face-to-vertex contact point shows a uniform distribution and the size of a cluster connected by face-to-face contacts shows a power-law distribution.