《实时控制软件设计》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几乎是蓝桥杯“单片机设计与开发”每年必考的内容,虽然在竞赛现场有提供一个底层读写寄存器的库文件,但是作 ...
随机推荐
- 十一、Struts2封装请求参数的方式
十一.Struts2封装请求参数的方式 方式一.Action 本身作为model对象,通过成员setter封装(一个名字为params的拦截器干的) 注意:表单中的名称要和动作类中的名称一致(这是必须 ...
- HTML 表单总结http://images2015.cnblogs.com/blog/1001203/201607/1001203-20160730200559841-2144892373.png
<!DOCTYPE html> <html> <head> <meta charset="utf-8" /> <title&g ...
- Query for Component Path within PeopleSoft Portal
1) Run the below SQL to get the content reference name for your component ;-- Replace :1 with the c ...
- WinForm界面布局控件WeifenLuo.WinFormsUI.Docking"的使用 (二)
WinForm界面布局控件WeifenLuo.WinFormsUI.Docking"的使用 (二) 编写人:CC阿爸 2015-1-29 今天我想与大家继续一起分享这一伟大的控件.有兴趣的同 ...
- Mysql导入导出 改密命令总结(笔记三)
一.从数据库导出数据 注意这些语句的执行是在在没进入mysql命令行之前,在mysql命令行不行 C:\Windows\system32>导出命令 而不是 Mysql>导出命令 1.导出整 ...
- HTML5 的新的表单属性
本章讲解涉及 <form> 和 <input> 元素的新属性. 新的 form 属性: autocomplete novalidate 新的 input 属性: autocom ...
- C# 多线程操作样例
using System; using System.Threading; //引用多线程 namespace ThreadTest { public class Alpha { public voi ...
- windows下python+flask环境配置详细图文教程
本帖是本人在安装配置python和flask环境时所用到的资源下载及相关的教程进行了整理罗列,来方便后面的人员,省去搜索的时间.如果你在安装配置是存在问题可留言给我. 首先罗列一下python+fla ...
- 普通委托到泛型委托到Linq
private delegate bool delTest(int a); private void button1_Click(object sender, EventArgs e) { var a ...
- webpack 学习笔记 01 使用webpack的原因
本系列文章实际上就是官网文档的翻译加上自己实践过程中的理解. 伴随着websites演化至web apps的过程,有三个现象是很明显的: 页面中有越来越多的Js. 客户端能做的事情越来越多. 越来越少 ...