《实时控制软件设计》Git 基本操作练习
根据老师提供的教程 对 数据库创建、提交文件、创建分支、删除分支、合并分支、冲突处理等操作进行了练习
得到log文件如下：
yanbin-guo@yanbinguo MINGW64 /Git (master)
$ git log
commit b36a19261c669f42f8f7eecd6d4969b322aeb012
Merge: 0ec3756 7d25f2a
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 21:53:56 2015 +0800
12 commit
commit 7d25f2a8fc6325d3285e9b13c469913eeae3164f
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 21:51:46 2015 +0800
11 commit
commit 0ec375638356e0166d3eb0166192a7c39380a3ef
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 21:51:08 2015 +0800
10 commit
commit 2043cf6be2f8425baad8a2318906ba9f193a7d18
Merge: 94d4e0a c860055
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 21:49:21 2015 +0800
eingth commit
commit 94d4e0aa22c51a73a9bfbb644839a9444ec1f597
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 21:41:41 2015 +0800
seventh commit
commit c8600556e157ae8ee3f6ee0993b214616d45feed
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 21:29:34 2015 +0800
fifth commit
commit 2c7d451209ffb27887dde2b02acdded0a93bac70
Author: HustPET <543893577@qq.com>
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:52:07 2015 +0800
forth commit
commit 56267facaa9fda816aa43a9e8e23e998dd1bc105
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
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 <543893577@qq.com>
Date: Fri Dec 18 20:46:38 2015 +0800
third commit
commit fef5cf0e047af3d47f954173a9db8295546c4012
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:44:27 2015 +0800
second commit
commit 9ce23d040eecdd7417e7d4cfe380edd4b763ef9c
Author: HustPET <543893577@qq.com>
Date: Fri Dec 18 20:39:21 2015 +0800
first commit
(END)
《实时控制软件设计》Git 基本操作练习的更多相关文章
- 《实时控制软件设计》之Automation Studio开发环境
Automation Studio是贝加莱公司的控制软件开发平台,软件可运行在贝加莱的基于PC的控制器上,基于Automation Studio我们可构建一个完整的控制软件构建.测试和仿真运行平台.本 ...
- 实时控制软件设计作业_01——汽车ABS系统分析
制动防抱死系统(antilock brake system)简称ABS.作用就是在汽车制动时,自动控制制动器制动力的大小,使车轮不被抱死,处于边滚边滑(滑移率在20%左右)的状态,以保证车轮与地面的附 ...
- 《实时控制软件设计》第一周作业 欧梓峰 U201317662 （更新）
CNC 插补计算程序分析 前言:插补(Interpolation),即机床数控系统依照一定方法确定刀具运动轨迹的过程.一般是已知起点坐标.终点坐标和轨迹,由数控插补计算程序实时的算出各个中间的坐标来拟 ...
- 实时控制软件设计第一周作业-汽车ABS软件系统案例分析
汽车ABS软件系统案例分析 ABS 通过控制作用于车轮制动分泵上的制动管路压力,使汽车在紧急刹车时车轮不会抱死,这样就能使汽车在紧急制动时仍能保持较好的方向稳定性. ABS系统一般是在普通制动系统基础 ...
- 《实时控制软件设计》之Github提交作业步骤
在掌握GIT/GITHUB基本操作后,接下来把第一次的编程作业提交到 https://github.com/RTCSD15/HOMEWORK1 ,把第二次的编程作业提交到https://github. ...
- 实时控制软件设计 第二次作业 myRobot
#include<iostream> #include <Eigen/Dense> #include <math.h> #include <vector> ...
- 实时控制软件设计 第一次作业 Draw
#include <iostream> #include <cstring> #include <math.h> #include <Eigen/Dense& ...
- Git基本操作和GtHub 特殊技巧
<GitHub 入门与实践> 笔记 了解GitHub Git 和 GitHub 的区别 在Git中,开发者将源代码存入名为"Git仓库"的资料库中,并加以使用.而Git ...
- 【蓝桥杯单片机12】实时时钟DS1302的基本操作
[蓝桥杯单片机12]实时时钟DS1302的基本操作 广东职业技术学院 欧浩源 实时时钟DS1302几乎是蓝桥杯“单片机设计与开发”每年必考的内容,虽然在竞赛现场有提供一个底层读写寄存器的库文件,但是作 ...
随机推荐
- leetcode 24
链表操作的,要注意标记头结点和边界问题. 代码如下: ListNode *swapPairs(ListNode *head) { if(head==NULL||head->next==NULL) ...
- poj1001_Exponentiation
这题真是超级大模拟.好繁琐,自己写的打数加法,乘法,写的比我大一时候写的要好很多,大一是借助C++里面的string来写的,这把只用了C,浇一次就ac了,挺开心的,不过写了2个小时啊.注意零的处理.大 ...
- poj1035 Spell checker
这题目比较简单,把思路搞清楚就可以啦. #include <stdio.h> #include <string.h> +][]; int init(){ ; while(~sc ...
- s3c6410_中断
参考: 1)<USER'S MANUAL-S3C6410X>Chapter 10 GPIO, Chapter 12 VECTORED INTERRUPT CONTROLLER 2)< ...
- linux下alias命令详解
功能说明:设置指令的别名. 语 法:alias[别名]=[指令名称] 形如: alias cp=“cp -i” : 补充说明:用户可利用alias,自定指令的别名.若仅输入alias,则可列出目前所有 ...
- Vue.js学习 Item11 – 组件与组件间的通信
什么是组件? 组件(Component)是 Vue.js 最强大的功能之一.组件可以扩展 HTML 元素,封装可重用的代码.在较高层面上,组件是自定义元素,Vue.js 的编译器为它添加特殊功能.在有 ...
- asp.net导出excel示例代码
asp.net导出excel的简单方法. excel的操作,最常用的就是导出和导入. 本例使用NPOI实现. 代码:/// <summary> ); ; ...
- php数组去重复代码
php数组去重复数据示例,有时候获得的php数组中总是出现value重复的,使用下面的方法就可以去掉重复数据 以数字开头的重复数据如: Array ( [0] => 100 [k1] =&g ...
- 多层级Spinner列表选项实时更新树形层级(选择城市)
package com.example.spinnerdemo; import android.os.Bundle; import android.app.Activity; import andro ...
- jquery实现radio按纽全不选和checkbox全选的实例
用jquery实现以下两个这个功能: 1.对所有单选按纽中radio全不选 单选按纽:<input type="radio" name="f1">A ...