《实时控制软件设计》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几乎是蓝桥杯“单片机设计与开发”每年必考的内容,虽然在竞赛现场有提供一个底层读写寄存器的库文件,但是作 ...
随机推荐
- 打造一个自动检测页面是否存在XSS的小插件
前言: 还记得刚玩Web安全时,就想着要是能有一个自动挖掘XSS漏洞的软件就好了.然后我发现了Safe3.JSky.AWVS.Netsparker等等,但是误报太多,而且特别占内存.后来发现了fidd ...
- PHP用Array模拟枚举
C#中枚举Enum的写法: /// <summary> /// 公开类型 2-好友可见 1-公开 0-不公开 /// </summary> public enum OpenSt ...
- WordPress 主题开发 - (十三) Archive模板 待翻译
What archive.php does (and all its related templates) is show posts based on a select criteria. A da ...
- php常用函数集锦[备份用的]
1.判断是否正确的日期格式 /** * 是否正确的日期 * * @access public */ private function _isdate($str,$format="Y-m-d ...
- PHP函数：生成N个不重复的随机数
思路:将生成的随机数存入数组,再在数组中去除重复的值,即可生成一定数量的不重复随机数. 程序: <?php /* * array unique_rand( int $min, int $max, ...
- 复习URLHttpConnection方式GET，POST方式链接网络解析uri
xml: <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:t ...
- 【Django】Apache上运行单个Django项目，mod_wsgi配置
1 安装环境 操作系统:Ubuntu 12.04 LTS 32 位(安装在VMware虚拟机中) python 版本: Python 2.7.3 Django版本 >>> djang ...
- WPF之旅（二）- XAML
什么是XAML XAML(Extensible Application Markup Lanaguage的简写,发音“zammel”)是用于实例化.NET对象的标记语言.尽管XAML是一种可以用于诸多 ...
- 浅谈iOS网络编程之一入门
计算机网络,基本上可以抽象是端的通信.实际在通讯中会用到不同的设备,不同的硬件中,为了能友好的传输信息,那么建立一套规范就十分必要了.先来了解一些基本概念 了解网络中传输的都是二进制数据流. 2.了 ...
- Java 需要记得、了解的关键词 （Java 学习中的小记录）
Java 需要记得.了解的关键词 (Java 学习中的小记录) 作者:王可利(Star·星星) 总结:本次随笔,仅且拿来平时翻阅记忆用