cat@rich-2 ~/visualcv/vcv (git::test) $ git st

working as Rich Downie

# On branch test
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	features/sharing/
nothing added to commit but untracked files present (use "git add" to track)
cat@rich-2 ~/visualcv/vcv (git::test) $ git add .
cat@rich-2 ~/visualcv/vcv (git::test) $ git st

working as Rich Downie

# On branch test
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   features/sharing/pros.feature
#
cat@rich-2 ~/visualcv/vcv (git::test) $ git commit -a
[test fd5f3fa] adding sharing scenarios
 1 files changed, 6 insertions(+), 0 deletions(-)
 create mode 100644 features/sharing/pros.feature
cat@rich-2 ~/visualcv/vcv (git::test) $ git st

working as Rich Downie

# On branch test
nothing to commit (working directory clean)
cat@rich-2 ~/visualcv/vcv (git::test) $ git co master
Switched to branch "master"
cat@rich-2 ~/visualcv/vcv (git::master) $ git pull
remote: Counting objects: 42, done.
remote: Compressing objects: 100% (26/26), done.
remote: Total 27 (delta 19), reused 0 (delta 0)
Unpacking objects: 100% (27/27), done.
From git@visualcv.unfuddle.com:visualcv/vcv
   7946e17..cfd7019  master     -> origin/master
   e38e398..6c67e16  release-2.1 -> origin/release-2.1
Updating 7946e17..cfd7019
Fast forward
 app/helpers/activity_helper.rb              |   51 +++++++++++++++++++++++++++
 app/models/position.rb                      |   21 +----------
 app/views/activity/viewers/_viewer.html.erb |   13 +------
 3 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 app/helpers/activity_helper.rb
cat@rich-2 ~/visualcv/vcv (git::master) $ git merge test
Merge made by recursive.
 features/sharing/pros.feature |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
 create mode 100644 features/sharing/pros.feature
cat@rich-2 ~/visualcv/vcv (git::master) $ git st

working as Rich Downie

# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#
nothing to commit (working directory clean)
cat@rich-2 ~/visualcv/vcv (git::master) $ git push origin master
Counting objects: 10, done.
Delta compression using 2 threads.
Compressing objects: 100% (6/6), done.
Writing objects: 100% (7/7), 769 bytes, done.
Total 7 (delta 3), reused 0 (delta 0)
To git@visualcv.unfuddle.com:visualcv/vcv.git
   cfd7019..ac30ace  master -> master
cat@rich-2 ~/visualcv/vcv (git::master) $