git所有的命令都是以git开头 后面为所要做的操作 再后面即为参数

• 初始化 git init 初始化后会生成.git文件
• git clone URL 将URL地址下的资源clone到本地
• git add . 将当前目录下面的文件提交到暂存区
• git commit -m ‘你所做的修改，利于以后维护和回退’ 会得到一个指针
• git push origin master 上传代码到github master分支
• git branch 查看所有分支
• git branch hexo 新建名为hexo的分支
• git checkout hexo 切换到hexo分支
• git merge 合并指定分支到当前分支

##git合并分支
 git支持很多种工作流程，在进行合作开发时一般是这样，远程创建一个主分支，本地每人创建功能分支，日常工作流程如下：

1. 去自己的工作分支

   git checkout work

2. 工作
   ….

3. 提交工作分支的修改

   git commit -a

4.回到主分支

git checkout master

5.获取远程最新的修改，此时不会产生冲突

git pull

6.回到工作分支

git checkout work

7.用rebase合并主干的修改，如果有冲突在此时解决

git rebase master

8.回到主分支

git checkout master

9.合并工作分支的修改，此时不会产生冲突。

git merge work

10.提交到远程主干

git push origin master

这样做的好处是，远程主干上的历史永远是线性的。每个人在本地分支解决冲突，不会在主干上产生冲突.

可以在一条分支上一起开发，你有变更的时候，在提交前，使用

git stash

这样将本地的修改全部缓存在一个堆栈中了，然后把别人的修改同步过来

git pull –rebase

下一步是将自己的变更恢复到最新的节点上

git stash pop

然后再使用git commit提交，这样就会让一个分支的版本按顺序继续发展

Hexo 是开源的npm的博客包

使用markdown语法写博客 结合github page 服务，有一个免费的开源博客

• git配置过程

  • 全局配置 username email ssh
    在git bash中执行代码：

       1. git config global user.name "gitname"  
       2.git config global user.email "email"  
       3.ssh-keygen -t rsa -C "git@email"  一路回车  
    

    找到.ssh文件夹 打开id_rsa.pub复制内容

       4.到github上 setting 中ssh key添加 title为空 粘贴ssh至内容中  
    

  • 验证一下是否成功
    1.在hexo目录下将
    https://github.com/HeiLiu/HeiLiu.github.io.git

• hexo init 初始化博客

  1. 执行一下初始化命令系统会去github clone一个博客来到本地
  2. ./node_modules是以来文件夹，npm包 项目所有依赖都在这里。 3.博客存放地址 source/_post/**.md 4.markdown 语法 更简捷的写html 5.theme主题文件夹

• hexo clean

  • 清空生成的站点博客文件

• hexo generate

  • 博客的产生
    hexo generate 将markdown语法编译成public/*.html

• hexo server

  打开本地服务器  
  

• hexo deploy

  • 将本地生成的public文件内容发布到github

hexo 不蒜子统计不显示的问题

This is a image test post.

This post contains 4 photos:

• Widescreen wallpaper
• Portrait photo
• Dual widescreen wallpaper
• Small photo

All photos should be displayed properly.

From Wallbase.cc

This post is used for testing tag plugins.

Block Quote

Normal blockquote

Praesent diam elit, interdum ut pulvinar placerat, imperdiet at magna.

Quote from a book

Do not just seek happiness for yourself. Seek happiness for all. Through kindness. Through mercy.

Quote from Twitter

NEW: DevDocs now comes with syntax highlighting. http://devdocs.io

Quote from an article on the web

Every interaction is both precious and an opportunity to delight.

Code Block

Normal code block

alert('Hello World!');

With caption

array.map(callback[, thisArg])

With caption and URL

.compact([0, 1, false, 2, ‘’, 3]);
=> [1, 2, 3]

With marked lines

Line 1,7-8,10 should be marked with different color.

const http = require('http');

const hostname = '127.0.0.1';
const port = 1337;

http.createServer((req, res) => {
  res.writeHead(200, { 'Content-Type': 'text/plain' });
  res.end('Hello World\n');
}).listen(port, hostname, () => {
  console.log(`Server running at http://${hostname}:${port}/`);
});

Note: Theme’s style should support .highlight.line.marked (recommend to use the selection or current line color).

Gist

jsFiddle

Pullquote

Left

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas tempus molestie arcu, et fringilla mauris placerat ac. Nullam luctus bibendum risus. Ut cursus sed ipsum feugiat egestas. Suspendisse elementum, velit eu consequat consequat, augue lorem dapibus libero, eget pulvinar dolor est sit amet nulla. Suspendisse a porta tortor, et posuere mi. Pellentesque ultricies, mi quis volutpat malesuada, erat felis vulputate nisl, ac congue ante tortor ut ante. Proin aliquam sem vel mauris tincidunt, eget scelerisque tortor euismod. Nulla tincidunt enim nec commodo dictum. Mauris id sapien et orci gravida luctus id ut dui. In vel vulputate odio. Duis vel turpis molestie, scelerisque enim eu, lobortis eros. Cras at ipsum gravida, sagittis ante vel, viverra tellus. Nunc mauris turpis, elementum ullamcorper nisl pretium, ultrices cursus justo. Mauris porttitor commodo eros, ac ornare orci interdum in. Cras fermentum cursus leo sed mattis. In dignissim lorem sem, sit amet elementum mauris venenatis ac.

Right

Lorem ipsum dolor sit amet, consectetur adipiscing elit.

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed ligula justo, lobortis sit amet semper vel, dignissim sit amet libero. Praesent ac tempus ligula. Maecenas at gravida odio. Etiam tristique volutpat lacus eu faucibus. Donec non tempus arcu. Phasellus adipiscing, mauris nec mollis egestas, ipsum nunc auctor velit, et rhoncus lorem ipsum at ante. Praesent et sem in velit volutpat auctor. Duis vel mauris nulla. Maecenas mattis interdum ante, quis sagittis nibh cursus et. Nulla facilisi. Morbi convallis gravida tortor, ut fermentum enim gravida et. Nunc vel dictum nisl, non ultrices libero. Proin vestibulum felis eget orci consectetur lobortis. Vestibulum augue nulla, iaculis vitae augue vehicula, dignissim ultrices libero. Sed imperdiet urna et quam ultrices tincidunt nec ac magna. Etiam vel pharetra elit.

This post contains 3 tags. Make sure your theme can display all of the tags.