Actually, yoga means meditation on the form of Lord Visnu. If the yoga practice is actually performed according to the standard direction, there is no difference between yoga and bhakti-yoga: Revision history
Diff selection: Mark the radio buttons of the revisions to compare and hit enter or the button at the bottom.
Legend: (cur) = difference with latest revision, (prev) = difference with preceding revision, m = minor edit.