Although it temporally disappeared due to the order issued by Edo bakufu (Japanese feudal government headed by a shogun) which banned samurai to carry the naginata during Edo period, it came back as a martial art for women.
江戸時代には江戸幕府が武士の薙刀所持を禁止した事により行き場を一時無くすが、女子の武芸とする事で喪失を免れた。