Git branching, pulling and pushing etc.

Alice/> git init --template=""
Initialized empty Git repository in /home/rene/github/github/git-internals/repos/branch_2/Alice/.git/

Alice/> printf "one\ntow\nthree\nfour\nfife\nsix\nseven\neigth\nnine\n" > numbers.txt

Alice/> git add numbers.txt

Alice/> git commit numbers.txt -m "+ numbers.txt"
[master (root-commit) 80e3760] + numbers.txt
 1 file changed, 9 insertions(+)
 create mode 100644 numbers.txt

Alice/> cat numbers.txt
one
tow
three
four
fife
six
seven
eigth
nine

Alice/> git checkout -b fixTypo
Switched to a new branch 'fixTypo'

Alice/> sed -i s/tow/two/ numbers.txt

Alice/> git commit numbers.txt -m "Fix typo: tow->two"
[fixTypo e0cea2c] Fix typo: tow->two
 1 file changed, 1 insertion(+), 1 deletion(-)

Alice/> sed -i s/fife/five/ numbers.txt

Bob/> git clone --template="" /home/rene/github/github/git-internals/repos/branch_2/Alice .
Cloning into '.'...
done.

Bob/> git branch
* fixTypo

Bob/> git branch -r
  origin/HEAD -> origin/fixTypo
  origin/fixTypo
  origin/master

Bob/> git branch -a
* fixTypo
  remotes/origin/HEAD -> origin/fixTypo
  remotes/origin/fixTypo
  remotes/origin/master

Bob/> cat numbers.txt
one
two
three
four
fife
six
seven
eigth
nine

Bob/> git branch master origin/master
Branch master set up to track remote branch master from origin.

Bob/> git checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.

Bob/> cat numbers.txt
one
tow
three
four
fife
six
seven
eigth
nine

Alice/> git commit numbers.txt -m "Fix typo fife->five"
[fixTypo cc7b5b3] Fix typo fife->five
 1 file changed, 1 insertion(+), 1 deletion(-)

Bob/> printf "eleven\ntwelve\n" >> numbers.txt

Bob/> git commit numbers.txt -m "add 11 and 12"
[master f6ef2aa] add 11 and 12
 1 file changed, 2 insertions(+)

Bob/> git push origin master
To /home/rene/github/github/git-internals/repos/branch_2/Alice
   80e3760..f6ef2aa  master -> master

Bob/> git pull
From /home/rene/github/github/git-internals/repos/branch_2/Alice
   e0cea2c..cc7b5b3  fixTypo    -> origin/fixTypo
Already up-to-date.

Bob/> git checkout fixTypo
Switched to branch 'fixTypo'
Your branch is behind 'origin/fixTypo' by 1 commit, and can be fast-forwarded.
  (use "git pull" to update your local branch)

Bob/> cat numbers.txt
one
two
three
four
fife
six
seven
eigth
nine

Bob/> git pull
Updating e0cea2c..cc7b5b3
Fast-forward
 numbers.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Bob/> cat numbers.txt
one
two
three
four
five
six
seven
eigth
nine

Alice/> git checkout master
Switched to branch 'master'

Alice/> cat numbers.txt
one
tow
three
four
fife
six
seven
eigth
nine
eleven
twelve