Git学习记录1
2018-03-29 20:58
253 查看
1. 安装
操作系统: Ubuntu 16.04 LTSsudo apt-get install git
3. 基本操作
场景1:自己一个人玩
小明要写一个README.md文件vim README.md
git status
git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: README.md
no changes added to commit (use "git add" and/or "git commit -a")
git branch
2nd-version
* master
git checkout 2nd-version
Switched to branch '2nd-version'泉水涌动,一顿改vim README.md
git add .
git commit -m "changed sth in 2nd-version branch"这个版本不错,合并到master上git checkout master
git merge 2nd-version场景2:跟一个同学一其做一个项目
待更新
场景3:git workflow
操作系统: Ubuntu 16.04 LTSsudo apt-get install git
git --version
git config --global user.name xxx git config --global user.email xxx@xxx.com
cd ~/Desktop mkdir gittest cd gittest git init2. 原理git add
3. 基本操作
场景1:自己一个人玩
小明要写一个README.md文件vim README.md
git status
On branch master # 在什么分支上, 这里是主分支为master Initial commit Untracked files: # 在git仓库里没有检测到下面这些文件 (use "git add <file>..." to include in what will be committed) # 提示:通过git add <文件名> 这个方法把要提交的文件加进去 README.md nothing added to commit but untracked files present (use "git add" to track)
git add README.md git status
On branch master Initial commit Changes to be committed: # 下面是已经在等待提交的文件(目前存在stage里面) (use "git rm --cached <file>..." to unstage) # 提示: 可以通过git rm --cached <文件名> 把在stage环境的文件取出来 new file: README.md
git commit -m "Initial Commit: add README.md" # 提交文件 [master (root-commit) a88caa2] Initial Commit: add README.md # 由master提交文件, 增加了README.md文件 1 file changed, 1 insertion(+) # git环境中有一个文件发生了变化,这个文件增加了一行内容 create mode 100644 README.md
git status On branch master # 目前在分支:master上 nothing to commit, working directory clean # 没有需要提交的内容现在修改文件vim README.md
git status
On branch master
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: README.md
no changes added to commit (use "git add" and/or "git commit -a")
git add . git commit -m "first time change the file after 1st commit"这个版本已经可以用了,但是想突然想修改一下,又不想破坏以前的版本,可以建立一个新的branchgit branch 2nd-version
git branch
2nd-version
* master
git checkout 2nd-version
Switched to branch '2nd-version'泉水涌动,一顿改vim README.md
git add .
git commit -m "changed sth in 2nd-version branch"这个版本不错,合并到master上git checkout master
git merge 2nd-version场景2:跟一个同学一其做一个项目
待更新
场景3:git workflow