Skip to content

S
Svn-to-Git
Commit 0195417b authored by 王进波's avatar 王进波
Browse files
Options

update

parent c4964529
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 34 deletions
doc/FromSVNToGit/DemonstrateInSourceTree.md
View file @ 0195417b
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*
- [图形界面的Git - SourceTree](#%E5%9B%BE%E5%BD%A2%E7%95%8C%E9%9D%A2%E7%9A%84git---sourcetree)
- [先看看SourceTree的界面](#%E5%85%88%E7%9C%8B%E7%9C%8Bsourcetree%E7%9A%84%E7%95%8C%E9%9D%A2)
- [Local](#local)
- [Remote](#remote)
- [Clone](#clone)
- [Add](#add)
- [Create](#create)
- [clone 仓库到本地](#clone-%E4%BB%93%E5%BA%93%E5%88%B0%E6%9C%AC%E5%9C%B0)
- [修改文件](#%E4%BF%AE%E6%94%B9%E6%96%87%E4%BB%B6)
- [add 修改到暂存区](#add-%E4%BF%AE%E6%94%B9%E5%88%B0%E6%9A%82%E5%AD%98%E5%8C%BA)
- [commit 提交暂存区的修改](#commit-%E6%8F%90%E4%BA%A4%E6%9A%82%E5%AD%98%E5%8C%BA%E7%9A%84%E4%BF%AE%E6%94%B9)
- [push 将本地分支推送到远程分支](#push-%E5%B0%86%E6%9C%AC%E5%9C%B0%E5%88%86%E6%94%AF%E6%8E%A8%E9%80%81%E5%88%B0%E8%BF%9C%E7%A8%8B%E5%88%86%E6%94%AF)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
<!-- START doctoc generated TOC please keep comment here to allow auto update -->
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)*
- [图形界面的Git - SourceTree](#%E5%9B%BE%E5%BD%A2%E7%95%8C%E9%9D%A2%E7%9A%84git---sourcetree)
- [先看看SourceTree的界面](#%E5%85%88%E7%9C%8B%E7%9C%8Bsourcetree%E7%9A%84%E7%95%8C%E9%9D%A2)
- [Local](#local)
- [Remote](#remote)
- [Clone](#clone)
- [Add](#add)
- [Create](#create)
- [clone 仓库到本地](#clone-%E4%BB%93%E5%BA%93%E5%88%B0%E6%9C%AC%E5%9C%B0)
- [修改文件](#%E4%BF%AE%E6%94%B9%E6%96%87%E4%BB%B6)
- [add 修改到暂存区](#add-%E4%BF%AE%E6%94%B9%E5%88%B0%E6%9A%82%E5%AD%98%E5%8C%BA)
- [commit 提交暂存区的修改](#commit-%E6%8F%90%E4%BA%A4%E6%9A%82%E5%AD%98%E5%8C%BA%E7%9A%84%E4%BF%AE%E6%94%B9)
- [push 将本地分支推送到远程分支](#push-%E5%B0%86%E6%9C%AC%E5%9C%B0%E5%88%86%E6%94%AF%E6%8E%A8%E9%80%81%E5%88%B0%E8%BF%9C%E7%A8%8B%E5%88%86%E6%94%AF)
<!-- END doctoc generated TOC please keep comment here to allow auto update -->
## 图形界面的Git - SourceTree
### 先看看SourceTree的界面
......@@ -25,7 +25,7 @@
展示已经添加到SourceTree管理目录的本地仓库
![1533193111596](E:/Codes/CityGit/SVN-To-Git/imgs/1533193111596.png)
![1533193111596](../../imgs/1533193111596.png)
......@@ -33,7 +33,7 @@
展示我们通过关联第三方账号连接的第三方Git托管服务里的远程仓储，如图，我们在SourceTree上登陆GitHub账号后，就可以浏览我们在Github上拥有的仓库，也可以进行clone操作。
![1533193163300](E:/Codes/CityGit/SVN-To-Git/imgs/1533193163300.png)
![1533193163300](../../imgs/1533193163300.png)
......@@ -41,7 +41,7 @@
将远程仓库clone到本地，这一步操作与我们在命令行界面下执行 `git clone` 的过程是一样的
![1533193425740](E:/Codes/CityGit/SVN-To-Git/imgs/1533193425740.png)
![1533193425740](../../imgs/1533193425740.png)
......@@ -49,13 +49,13 @@
添加本地的Git仓库到SourceTree的管理目录，添加后我们就可以在Local下面看到这个仓库了
![1533193706247](E:/Codes/CityGit/SVN-To-Git/imgs/1533193706247.png)
![1533193706247](../../imgs/1533193706247.png)
#### Create
创建新的本地Git仓库，这个过程类似我们在命令行界面执行 `git init`![1533193776265](E:/Codes/CityGit/SVN-To-Git/imgs/1533193776265.png)
创建新的本地Git仓库，这个过程类似我们在命令行界面执行 `git init`![1533193776265](../../imgs/1533193776265.png)
......@@ -69,19 +69,19 @@
>
> Name：SourceTree的标签名称，即SourceTree会为你的本地仓库命名一个别称，也可以和Git仓库名称保持一致
![1533194509699](E:/Codes/CityGit/SVN-To-Git/imgs/1533194509699.png)
![1533194509699](../../imgs/1533194509699.png)
成功
![1533194546869](E:/Codes/CityGit/SVN-To-Git/imgs/1533194546869.png)
![1533194546869](../../imgs/1533194546869.png)
在这个界面上我们就可以方便地查看本地仓库当前状态，完成 `add` `commit` `push` `branch` `merge` `fetch` `pull` `rebase` 等等操作。
![1533194620043](E:/Codes/CityGit/SVN-To-Git/imgs/1533194620043.png)
![1533194620043](../../imgs/1533194620043.png)
......@@ -93,7 +93,7 @@
完成修改后，当我们将窗口切换到SourceTree的界面的时候，SourceTree会自动执行`git status`命令，并将结果可视化地输出到界面上来
![1533195476785](E:/Codes/CityGit/SVN-To-Git/imgs/1533195476785.png)
![1533195476785](../../imgs/1533195476785.png)
我们可以大致将界面划分成几个区域，来学习一下不同区域的主要功能。
......@@ -114,11 +114,11 @@
和命令行一样，我们需要将修改添加到暂存区，红框所示，可以选择全部stage还是选择性stage，这里stage就是添加到暂存区的意思
![1533196272263](E:/Codes/CityGit/SVN-To-Git/imgs/1533196272263.png)
![1533196272263](../../imgs/1533196272263.png)
我们Stage all以后，三项修改就被添加到暂存区了
![1533196344803](E:/Codes/CityGit/SVN-To-Git/imgs/1533196344803.png)
![1533196344803](../../imgs/1533196344803.png)
......@@ -126,11 +126,11 @@
SourceTree在Commit修改的时候也需要写注释，界面工具也为我们提供了一些可选的提交选项，我们可以根据需要来配置。
![1533196602631](E:/Codes/CityGit/SVN-To-Git/imgs/1533196602631.png)
![1533196602631](../../imgs/1533196602631.png)
提交后，切换到Log/History界面，可以看到本次提交已经生成，在分支提交历史树上也可以看到我们这次的提交，然后再顶部Push按钮上显示了一个蓝色的上标，数字为1，标识有一个可执行的push
![1533196970726](E:/Codes/CityGit/SVN-To-Git/imgs/1533196970726.png)
![1533196970726](../../imgs/1533196970726.png)
......@@ -138,11 +138,11 @@ SourceTree在Commit修改的时候也需要写注释，界面工具也为我们
点击Push按钮，弹出Push对话框，默认只有一个master分支，本地也是master分支，我们将本地master分支push到远程master分支，即origin/master。
![1533197086917](E:/Codes/CityGit/SVN-To-Git/imgs/1533197086917.png)
![1533197086917](../../imgs/1533197086917.png)
push成功
![1533197167895](E:/Codes/CityGit/SVN-To-Git/imgs/1533197167895.png)
![1533197167895](../../imgs/1533197167895.png)
从SVN到Git.md
View file @ 0195417b
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment