《实时控制软件设计》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几乎是蓝桥杯“单片机设计与开发”每年必考的内容,虽然在竞赛现场有提供一个底层读写寄存器的库文件,但是作 ...
随机推荐
- 添加favicon.ico网站文件
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" me ...
- Java druid
1.ConnectionFactory (添加引用:druid-1.0.1.jar) package nankang.test; import java.sql.Connection; import ...
- 设计模式-外观模式(Facade)
简介 外观模式(Facade),将外部与内部子系统的通信通过一个统一的门面对象进行. 由两部分组成: 门面角色:供外部调用,内部可能组装了多个子系统,多个方法. 子系统角色:子系统的方法也可以直接供外 ...
- PHP出错界面详细说明
在web 上所有常见的错误之一就是无效的链接.一旦从其它站点上出现了无效的链接,你会重新安排你 的站点.人们会将他们喜欢的站点存成书签,如果在三个月后再次访问时,仅仅发现的是'404 Not Foun ...
- ububtu 14.04 问题集合
作者:jostree 转载请注明出处 http://www.cnblogs.com/jostree/p/4168168.html 1.Chromium 中的flash插件问题: sudo apt-ge ...
- seaJS学习资料参考
seajs官方文档:http://seajs.org/docs/#docs http://wenku.it168.com/d_000096482.shtml http://blog.codinglab ...
- 使用Visual Studio Code开发Asp.Net Core WebApi学习笔记（七）-- 结构化配置
本篇将记录.Net Core里颇有特色的结构化配置的使用方法. 相比较之前通过Web.Config或者App.Config配置文件里使用xml节点定义配置内容的方式,.Net Core在配置系统上发生 ...
- webform网站相关数据控件和其他
一.asp:Repeater <div class="bd"> <ul> <asp:Repeater ID="rept_slide" ...
- Web serviser请求通道在等待 00:00:59.6479648 以后答复时超时。增加传递给请求调用的超时值，或者增加绑定上的 SendTimeout 值。分配给此操作的时间可能是更长超时的一部分。
可以把sendTimeout调长一点试试 .net webService 中: 设置这些参数,延长连接时间, closeTimeout="00:10:00" openTimeout ...
- MongoDB 3 + Windows 7 X64安装及配置
注册windows服务,使MongoDB自动启动 1.使用系统管理员运行cmd C:\Users\admin> d: C:\Users\admin> cd "mongodb的安装 ...