merge

rintaun@valhalla:~/gittest$ git init
Initialized empty Git repository in /home/rintaun/gittest/.git/

rintaun@valhalla:~/gittest$ touch first
rintaun@valhalla:~/gittest$ git add first
rintaun@valhalla:~/gittest$ git commit -m "first"
[master (root-commit) 0f60b13] first
 0 files changed
 create mode 100644 first

rintaun@valhalla:~/gittest$ git checkout -b branch\
Switched to a new branch 'branch'

rintaun@valhalla:~/gittest$ touch second
rintaun@valhalla:~/gittest$ git add second
rintaun@valhalla:~/gittest$ git commit -m "second"
[branch 6baf532] second
 0 files changed
 create mode 100644 second

rintaun@valhalla:~/gittest$ git checkout master
Switched to branch 'master'

rintaun@valhalla:~/gittest$ touch third
rintaun@valhalla:~/gittest$ git add third
rintaun@valhalla:~/gittest$ git commit -m "third"
[master b5be15d] third
 0 files changed
 create mode 100644 third

rintaun@valhalla:~/gittest$ git checkout branch
Switched to branch 'branch'

rintaun@valhalla:~/gittest$ git merge master --ff-only
fatal: Not possible to fast-forward, aborting.

rintaun@valhalla:~/gittest$ git merge master
Merge made by the 'recursive' strategy.
 0 files changed
 create mode 100644 third

rintaun@valhalla:~/gittest$ git log
commit 3162178c4993c6979bf590a2f9a212dbbb1df598
Merge: 6baf532 b5be15d
Author: Matthew Lanigan <rintaun@gmail.com>
Date:   Fri May 24 09:31:09 2013 -0500

    Merge branch 'master' into branch

commit b5be15d9edd30383ebd2737494273f358c358bca
Author: Matthew Lanigan <rintaun@gmail.com>
Date:   Fri May 24 09:30:54 2013 -0500

    third

commit 6baf5323b0625fe818d7cf74a625245e2114c3f7
Author: Matthew Lanigan <rintaun@gmail.com>
Date:   Fri May 24 09:29:54 2013 -0500

    second

commit 0f60b133e8b94f3b442dbd01e2aef18628c223d5
Author: Matthew Lanigan <rintaun@gmail.com>
Date:   Fri May 24 09:29:34 2013 -0500

    first

rebase

rintaun@valhalla:~/gittest$ git init
Initialized empty Git repository in /home/rintaun/gittest/.git/

rintaun@valhalla:~/gittest$ touch first
rintaun@valhalla:~/gittest$ git add first
rintaun@valhalla:~/gittest$ git commit -m "first"
[master (root-commit) fb461d5] first
 0 files changed
 create mode 100644 first


rintaun@valhalla:~/gittest$ git checkout -b branch
Switched to a new branch 'branch'

rintaun@valhalla:~/gittest$ touch second
rintaun@valhalla:~/gittest$ git add second
rintaun@valhalla:~/gittest$ git commit -m "second"
[branch ef74019] second
 0 files changed
 create mode 100644 second

rintaun@valhalla:~/gittest$ git checkout master
Switched to branch 'master'

rintaun@valhalla:~/gittest$ touch third
rintaun@valhalla:~/gittest$ git add third
rintaun@valhalla:~/gittest$ git commit -m "third"
[master e5602ea] third
 0 files changed
 create mode 100644 third

rintaun@valhalla:~/gittest$ git checkout branch
Switched to branch 'branch'

rintaun@valhalla:~/gittest$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: second

rintaun@valhalla:~/gittest$ git log
commit 3a88536e8ee601fab0739235cdb54607db05c288
Author: Matthew Lanigan <rintaun@gmail.com>
Date:   Fri May 24 09:25:34 2013 -0500

    second

commit e5602ea40e827ac3dc736866a995456fe16c61f2
Author: Matthew Lanigan <rintaun@gmail.com>
Date:   Fri May 24 09:25:46 2013 -0500

    third

commit fb461d5405e454e4ec2ffb1d5facdb8514eeaf8a
Author: Matthew Lanigan <rintaun@gmail.com>
Date:   Fri May 24 09:25:11 2013 -0500

    first