<html>
<head>
<title>Evernote Export</title>
<basefont face="微软雅黑" size="2" />
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="exporter-version" content="YXBJ Windows/608170 (zh-CN, DDL); Windows/10.0.0 (Win64); EDAMVersion=V2;"/>
<style>
body, td {
font-family: 微软雅黑;
font-size: 10pt;
}
</style>
</head>
<body>
<a name="566"/>
<div>
<span><div><div>Git的工作流程：</div><div><img src="Git_files/Image.png" type="image/png" data-filename="Image.png" width="708"/></div><div><br/></div><div>安装好后设置user.name和user.email</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git config --global user.name "your name"</div><div>git config --global user.email "your email"</div></div><div><br/></div><div>初始化:</div><div><br/></div><div>在项目文件夹下输入git init初始化git本地仓库</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git init</div></div><div><img src="Git_files/Image [1].png" type="image/png" data-filename="Image.png"/></div><div><br/></div><div>.bashrc文件可以保存别名</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>alias ll='ls -al'</div><div>alias git-log="git log --pretty=oneline --abbrev-commit --all --graph"</div></div><div>在git bash界面输入source .bashrc加载</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>source .bashrc</div></div><div><br/></div><div>.gitignore文件可以设置一些不愿意提交的文件,例如</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>*.a</div></div><div>表示后缀名是a的文件不提交,例如setting.a</div><div>.gitignore一行设置一个不愿意提交的文件正则，注释用#</div><div><br/></div><div>git add [文件名]添加文件到暂存区,例如</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git add a.txt</div></div><div>就把a.txt文件加入到暂存区了，</div><div>也可以使用 git add . 来把所有文件都添加到暂存区(不包括 .gitignore里的文件)</div><div>使用git commit -m "注释" 来把文件提交到本地仓库</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git commit -m "first commit"</div></div><div><br/></div><div>git版本回退：</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git reset --hard 版本id</div><div>可以用git log查看版本id,也可以用保存在.bashrc里的git-log查看</div></div><div><br/></div><div>git reflog查看已经删除的记录</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git reflog</div></div><div><br/></div><div>git创建分支</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git branch 分支名</div></div><div><br/></div><div>git切换分支</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git checkout 分支名</div></div><div><br/></div><div>git创建并切换分支</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git checkout -b 分支名</div></div><div><br/></div><div>git合并分支，假如现在处于master分支里</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git merge dev01</div></div><div>可以把dev01分支合并到master分支里</div><div><br/></div><div>git删除分支</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git branch -d 分支名</div></div><div><br/></div><div>git查看所有分支</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>git branch</div></div><div><br/></div><div>git一些主流分支名：</div><div style="box-sizing: border-box; padding: 8px; font-family: Monaco, Menlo, Consolas, "Courier New", monospace; font-size: 12px; color: rgb(51, 51, 51); border-radius: 4px; background-color: rgb(251, 250, 248); border: 1px solid rgba(0, 0, 0, 0.15);-en-codeblock:true;"><div>master:<b style="background-color: rgb(255, 250, 165);-evernote-highlight:true;">（生产）主分支</b>，线上分支；</div><div>develop:<b style="background-color: rgb(255, 250, 165);-evernote-highlight:true;">（开发）分支</b>,是从master创建的分支，一般作为开发部门的主要开发分支；</div><div>feature:</div><div>hotfix:</div></div><div><br/></div><div><br/></div><div>推送到gitee</div><div>通过rsa密钥形式:</div><div>在本地获取rsa密钥，在gitee上添加rsa密钥</div><div>本地生成rsa密钥:</div><div>在cmd中输入</div><div style="box-sizing: border-box; padding: 8px; font-family: Mo
