Git common command line operation "Go"

Common commands:

I. Configure GIT submitted personal information, please configure your own name and company assigned email address

git config-global user.name "name"

git config-global user.email "[email protected]"

Two. Initial download of remote code

git clone [email protected]:p Roject.git

Three. Submit to the Local repository

git Add.

git commit-m "comment"

Four. Update the Code

New Keep the local workspace clean, that is, the code is put into the local warehouse

The git status command allows you to see the following information

Nothing-to-commit, working directory clean

Update the code again

Git pull-rebase

Five. Submit the code to the remote

git push

Six.. gitignore file

is to filter local files, can be local personal environment or personal test and compile intermediate files, run dynamic file filter out,

Keep the remote code base clean without uploading to the server

Seven. It is recommended that developers create local development branches and a branch that synchronizes remote code

Git branch Dev

git checkout Dev

Dev Branch can be created, checkout can switch branches

To write code on the dev branch,

The Master branch is the synchronization Code branch,

In this scenario, you can upload the code as follows:

Assuming that the current branch is in Dev

Use the GIT branch command to see what the current branch is

Jinlibindembp:test jinlibin$ git Branch

* Dev

Master

If there is an * number in front of Dev, it indicates that the current branch is in Dev branch

1. Writing code in Development tools

2. Submit Code Command

git Add.

Git commit-m "Add"

3. Switch branches to master

git checkout Master

4. Updating Remote code

Git pull-rebase

5. Merging remote code to dev

git rebase master Dev

At this point the code may be from conflict, and the Git tool will prompt the conflict file

That requires manual resolution of the conflict, and the conflict code file is re-processed.

Then proceed

git Add.

Git rebase-continue

Success this time the branch will switch to Dev

6. Branch Switch to Master

git checkout Master

7. Merge code to Sync Branch master

git merge Dev

8. Submit the code to the remote

git push

9. Switch branches to Dev

git checkout Dev

10. Continue coding

In this way, each commit node of the code becomes a line, does not have a fork, and is convenient for code fallback.

Master: Default Development Branch; Origin: Default remote Repository

The following content is reproduced:

Initialize operation
$ git config-global user.name <name> #设置提交者名字
$ git config-global user.email <email> #设置提交者邮箱
$ git config-global core.editor <editor> #设置默认文本编辑器
$ git config-global merge.tool <tool> #设置解决合并冲突时差异分析工具
$ git config-list #检查已有的配置信息

Create a new version library
$ git clone <url> #克隆远程版本库
$ git init #初始化本地版本库

Modify and submit
$ git Add. #添加所有改动过的文件
$ git add <file> #添加指定的文件
$ git mv <old> <new> #文件重命名
$ git rm <file> #删除文件
$ git rm-cached <file> #停止跟踪文件但不删除
$ git commit-m <file> #提交指定文件
$ git commit-m "commit message" #提交所有更新过的文件
$ git commit-amend #修改最后一次提交
$ git commit-c head-a-amend #增补提交 (no new commit history is generated)

View commit History
$ git log #查看提交历史
$ git log-p <file> #查看指定文件的提交历史
$ git blame <file> #以列表方式查看指定文件的提交历史
$ GITK #查看当前分支历史纪录
$ GITK <branch> #查看某分支历史纪录
$ GITK--all #查看所有分支历史纪录
$ git branch-v #每个分支最后的提交
$ git status #查看当前状态
$ git diff #查看变更内容

Undo Action
$ git reset-hard HEAD #撤消工作目录中所有未提交文件的修改内容
$ git checkout HEAD <file1> <file2> #撤消指定的未提交文件的修改内容
$ git checkout HEAD. #撤消所有文件
$ git revert <commit> #撤消指定的提交

Branches and labels
$ git Branch #显示所有本地分支
$ git checkout <branch/tagname> #切换到指定分支或标签
$ git Branch <new-branch> #创建新分支
$ git branch-d <branch> #删除本地分支
$ git tag #列出所有本地标签
$ git tag <tagname> #基于最新提交创建标签
$ git tag-d <tagname> #删除标签

Merging and diffraction
$ git merge <branch> #合并指定分支到当前分支
$ git rebase <branch> #衍合指定分支到当前分支

Remote operation
$ git remote-v #查看远程版本库信息
$ git remote show <remote> #查看指定远程版本库信息
$ git remote add <remote> <url> #添加远程版本库
$ git fetch <remote> #从远程库获取代码
$ git pull <remote> <branch> #下载代码及快速合并
$ git push <remote> <branch> #上传代码及快速合并
$ git push <remote>: <branch>/<tagname> #删除远程分支或标签
$ git push-tags #上传所有标签

Reprint Office: http://www.douban.com/note/245204752/

Git common command line operation "Go"