git log sample

gistfile1.txt

(1) merge master for dev branch

*   commit 22d31273b5296fee636b94e18b073837d22361a9
|\  Merge: 5737ec5 b0e81b5
| | Author: 
| | Date:   Mon Jul 13 21:14:42 2015 +0900
| |
| |     Merge branch 'master' into development
| |
| |     Conflicts:
| |             file
| |
| * commit b0e81b55bf43970a1ecacc804969cc54586805a1
| | Author: 
| | Date:   Mon Jul 13 21:13:43 2015 +0900
| |
| |     hotfix for master
| |
* | commit 5737ec55d5c579c4188a115172813b4475208192
| | Author: 
| | Date:   Mon Jul 13 21:11:57 2015 +0900
| |
| |     commit4
| |
* | commit a522f6d724c3eec2008e09736afb2d70f07a609b
| | Author:
| | Date:   Mon Jul 13 21:11:38 2015 +0900
| |
| |     commit3
| |
* | commit a2200cf4b042d88d7f868916ceae989522edd6ea
|/  Author: 
|   Date:   Mon Jul 13 21:11:14 2015 +0900
|
|       commit2
|
* commit 29e2e8c0ef823c3379f5cc34e3dbce0cc51b62a6
  Author: 
  Date:   Mon Jul 13 21:10:45 2015 +0900


(2) using rebase

* commit 8cd1efc1ae193318f3a3ca1a053fab68d7e3bdf9
| Author: 
| Date:   Mon Jul 13 21:11:57 2015 +0900
|
|     commit4
|
* commit 231fd28766071bd3c573090d3404c626a2981de0
| Author: 
| Date:   Mon Jul 13 21:11:38 2015 +0900
|
|     commit3
|
* commit 9ca1774bbcf6218731d19d37cbeb010749c1821a
| Author: 
| Date:   Mon Jul 13 21:11:14 2015 +0900
|
|     commit2
|
* commit b0eaee39d68691f6c91abf27bff3d0b1a92064d4
| Author: 
| Date:   Mon Jul 13 21:15:52 2015 +0900
|
|     hotfix
|
* commit 29e2e8c0ef823c3379f5cc34e3dbce0cc51b62a6
  Author: 
  Date:   Mon Jul 13 21:10:45 2015 +0900

      commit1