git action

tmpmac:tmp tmpvar$ mkdir test
tmpmac:tmp tmpvar$ cd test
tmpmac:test tmpvar$ git init
Initialized empty Git repository in /private/tmp/test/.git/
tmpmac:test tmpvar$ echo "readme" > readme.txt
tmpmac:test tmpvar$ echo "some initial development" > dev.txt
tmpmac:test tmpvar$ git add .
tmpmac:test tmpvar$ git commit -am "initial development"
[master (root-commit) 70385a6] initial development
 2 files changed, 2 insertions(+), 0 deletions(-)
 create mode 100644 dev.txt
 create mode 100644 readme.txt
tmpmac:test tmpvar$ git branch dev
tmpmac:test tmpvar$ git checkout dev
Switched to branch 'dev'
tmpmac:test tmpvar$ ls
dev.txt		readme.txt
tmpmac:test tmpvar$ echo "some more development" >> dev.txt
tmpmac:test tmpvar$ git status
# On branch dev
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   dev.txt
#
no changes added to commit (use "git add" and/or "git commit -a")
tmpmac:test tmpvar$ git commit -am "some more development"
[dev 17d3189] some more development
 1 files changed, 1 insertions(+), 0 deletions(-)
tmpmac:test tmpvar$ echo "3rd stage of development" >> dev.txt
tmpmac:test tmpvar$ git commit -am "final development"
[dev b207c2b] final development
 1 files changed, 1 insertions(+), 0 deletions(-)
tmpmac:test tmpvar$ git checkout master
Switched to branch 'master'
tmpmac:test tmpvar$ git merge dev
Updating 70385a6..b207c2b
Fast-forward
dev.txt |    2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
tmpmac:test tmpvar$ git branch -a
 dev
* master
tmpmac:test tmpvar$ cat dev.txt 
some initial development
some more development
3rd stage of development
tmpmac:test tmpvar$ git checkout dev
Switched to branch 'dev'
tmpmac:test tmpvar$ echo "uh oh, even more development"
uh oh, even more development
tmpmac:test tmpvar$ echo "uh oh, even more development" > dev.txt 
tmpmac:test tmpvar$ git commit -am "4th line in development"
[dev 2ca1bfb] 4th line in development
1 files changed, 1 insertions(+), 3 deletions(-)
tmpmac:test tmpvar$ git checkout master
Switched to branch 'master'
tmpmac:test tmpvar$ git merge dev
Updating b207c2b..2ca1bfb
Fast-forward
dev.txt |    4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
tmpmac:test tmpvar$ git branch -a
 dev
* master
tmpmac:test tmpvar$ cat dev.txt 
uh oh, even more development
tmpmac:test tmpvar$ git branch -d dev
Deleted branch dev (was 2ca1bfb).
tmpmac:test tmpvar$ git reflog
2ca1bfb HEAD@{0}: merge dev: Fast-forward
b207c2b HEAD@{1}: checkout: moving from dev to master
2ca1bfb HEAD@{2}: commit: 4th line in development
b207c2b HEAD@{3}: checkout: moving from master to dev
b207c2b HEAD@{4}: merge dev: Fast-forward
70385a6 HEAD@{5}: checkout: moving from dev to master
b207c2b HEAD@{6}: commit: final development
17d3189 HEAD@{7}: commit: some more development
70385a6 HEAD@{8}: checkout: moving from master to dev