How The Noble prophet Conducted Pilgirmage:

We did not intend to do any thing other than pilgrimage.
We knew nothing about Umrah. When we arrived at
 the House with the Prophet (peace be on him) he
touched the corner (kissed the Black Stone) then he
moved in a jogging movement for three rounds and
walked in the other four.
He then went to Maqam Ibrahim and recited “Do pray at Maqam Ibrahim”. 
He stood with the Maqam between him and the house (the Ka’bah).
In his two rak’ahs he read Surah: “Al-Ikhlas” and Surah: “Al-Kafiroon”.
He then returned to the corner (of the Ka’bah, where the Black Stone is)
and kissed it.      
He then left through the door nearer to the hill of Safa. When he approached Safa he read: “Safa and Marwah are two places which Allah has made sacred”. 

He also said: “Start with the one with which Allah has started”. He went first to
 Safa and climbed up until he could see the Ka’bah, he turned his face towards the
 Qiblah and declared Allah’s unity and glorified Him.  
He then said: “there is no deity except Allah. He has no partners; to
Him belongs the Kingdom as well as all praise. He is able to do every thing.
There is no deity except Allah. He has fulfilled His promise, given victory to
His servant and has defeated the confederates on His own”.  
 This refers to the defeat of the allied forces of disbeliever’s when human forces
did not fight them. He also prayed Allah. He repeated these phrases three times,
 then descended towards Marwah.  When he was at the bottom of the valley
(marked nowadays with the two green marks) he started running.
When we were again climbing up he walked. When he arrived at Marwah he
did there the same as he did at Safa.