According to Pāṇini, the term yoga can be derived from either of two roots, yujir yoga (to yoke) or yuj samādhau ("to concentrate"). In the context of the Yoga Sutras of Patanjali, the root yuj samādhau (to concentrate) is considered by traditional commentators as the correct etymology. In accordance with Pāṇini, Vyasa who wrote the first commentary on the Yoga Sutras, states that yoga means samādhi (concentration).
Yogaśataka a Jain work by Haribhadra Suri 6th century CE "With conviction, the lords of Yogins have in our doctrine defined yoga as the concurrence (sambandhah) of the three [correct knowledge (sajjñana), correct doctrine (saddarsana) and correct conduct (saccaritra)] beginning with correct knowledge, since [thereby arises] conjunction with liberation....In common usage this [term] yoga also [denotes the soul’s] contact with the causes of these [three], due to the common usage of the cause for the effect. (2, 4).
Various yogic groups had become prominent in Punjab in the 15th and 16th century, when Sikhism was in its nascent stage. Compositions of Guru Nanak, the founder of Sikhism, describe many dialogues he had with Jogis, a Hindu community which practiced yoga. Guru Nanak rejected the austerities, rites and rituals connected with Hatha Yoga. He propounded the path of Sahaja yoga or Nama yoga (meditation on the name) instead. The Guru Granth Sahib states:
The Gita consists of 18 chapters and 700 shlokas (verses), with each chapter named as a different yoga, thus delineating eighteen different yogas. Some scholars divide the Gita into three sections, with the first six chapters with 280 shlokas dealing with Karma yoga, the middle six containing 209 shlokas with Bhakti yoga, and the last six chapters with 211 shlokas as Jnana yoga; however, this is rough because elements of karma, bhakti and jnana are found in all chapters.
The earliest extant systematic account of yoga and a bridge from the earlier Vedic uses of the term is found in the Hindu Katha Upanisad (Ku), a scripture dating from about the third century BCE[…] [I]t describes the hierarchy of mind-body constituents—the senses, mind, intellect, etc.—that comprise the foundational categories of Sāmkhya philosophy, whose metaphysical system grounds the yoga of the Yogasutras, Bhagavad Gita, and other texts and schools (Ku3.10–11; 6.7–8).