《实时控制软件设计》Git 基本操作练习

根据老师提供的教程 对 数据库创建、提交文件、创建分支、删除分支、合并分支、冲突处理等操作进行了练习

得到log文件如下：

yanbin-guo@yanbinguo MINGW64 /Git (master)
$ git log
commit b36a19261c669f42f8f7eecd6d4969b322aeb012
Merge: 0ec3756 7d25f2a
Author: HustPET <[email protected]>
Date:   Fri Dec 18 21:53:56 2015 +0800

    12 commit

commit 7d25f2a8fc6325d3285e9b13c469913eeae3164f
Author: HustPET <[email protected]>
Date:   Fri Dec 18 21:51:46 2015 +0800

    11 commit

commit 0ec375638356e0166d3eb0166192a7c39380a3ef
Author: HustPET <[email protected]>
Date:   Fri Dec 18 21:51:08 2015 +0800

    10 commit

commit 2043cf6be2f8425baad8a2318906ba9f193a7d18
Merge: 94d4e0a c860055
Author: HustPET <[email protected]>
Date:   Fri Dec 18 21:49:21 2015 +0800

    eingth commit

commit 94d4e0aa22c51a73a9bfbb644839a9444ec1f597
Author: HustPET <[email protected]>
Date:   Fri Dec 18 21:41:41 2015 +0800

    seventh commit

commit c8600556e157ae8ee3f6ee0993b214616d45feed
Author: HustPET <[email protected]>
Date:   Fri Dec 18 21:29:34 2015 +0800

    fifth commit

commit 2c7d451209ffb27887dde2b02acdded0a93bac70
Author: HustPET <[email protected]>
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit
(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)
Date:   Fri Dec 18 20:52:07 2015 +0800

    forth commit

commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:46:38 2015 +0800

    third commit

commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:44:27 2015 +0800

    second commit

commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <[email protected]>
Date:   Fri Dec 18 20:39:21 2015 +0800

    first commit

(END)