Git

Pull changes in from master that have happened since making changes on feature branch

git checkout feature
git rebase master

Merge feature branch into master

To merge a feature into master, first commit changes to your feature branch, then:

git checkout master
git pull origin master
git merge feature
git push origin master

See history

git log to see all. Include file if you only want to see history for that file: git log [filename]