文章目录

1. 1. Install git.
2. 2. Global Config
3. 3. Initialize
4. 4. Add files
5. 5. Commit locally.
6. 6. Generate SSH key.
7. 7. Test your account
8. 8. Connect to your repository and push
9. 9. Revert changes made to your working copy
10. 10. Revert changes made to the index (i.e., that you have added)
11. 11. Revert a change that you have committed
12. 12. How to show what a commit did
13. 13. Create a new remote branch
14. 14. Handle conflicts when pulling changes from remote
15. 15. Diff local changes after staged
16. 16. throw away the local commits, and pull the remote commits at origin/master
17. 17. Ignore file mode differences
18. 18. Delete the last commit
19. 19. DIFF files between 2 different branches
20. 20. 克隆一个仓库，不拿所有的历史
21. 21. GIT clone branch only
22. 22. 新建一个分支时，一定要记得加上
23. 23. Ignore folder that accidentally committed
24. 24. Git 协作流程
25. 25. 常用 Git 命令清单

Install git.

Global Config

git config --global user.name "Your Real Name"
git config --global user.email [email protected]
git config --global core.filemode false

Initialize

mkdir my_git_repo
cd my_git_repo
git init
touch README.md

Add files

git add .

Commit locally.

git commit -m 'first commit.'

Generate SSH key.

ssh-keygen -C '[email protected]' -t rsa

Test your account

ssh -v [email protected]

Connect to your repository and push

git remote add origin [email protected]:<username>/<projectname>.git
git push origin master

Revert changes made to your working copy

git checkout .

Revert changes made to the index (i.e., that you have added)

git reset

Revert a change that you have committed

git revert ...

How to show what a commit did

git show <commit-id>
git log -p
git log -p commit1 commit2

Create a new remote branch

git push -u origin <local-branch-name>:<remote-branch-name>

Handle conflicts when pulling changes from remote

git stash
git pull
<git merge, git commit> THIS STEP IS OPTIONAL
git stash pop

Diff local changes after staged

git diff --cached

throw away the local commits, and pull the remote commits at origin/master

git fetch origin
git reset --hard origin/master

Ignore file mode differences

git config core.fileMode false
git config --global core.autocrlf true
git config --local core.autocrlf true

Delete the last commit

git reset HEAD^ --hard
git push origin -f

DIFF files between 2 different branches

git diff mybranch master -- myfile.cs

克隆一个仓库，不拿所有的历史

git clone —depth 1 git://xxx/xxx.git

GIT clone branch only

git clone -b my branch --single-branch git://xxx/xxx.git

新建一个分支时，一定要记得加上

git branch --set-upstream-to branchName origin/branchName

• As of Git 1.8.0:

git branch -u upstream/foo

Or, if local branch foo is not the current branch:

git branch -u upstream/foo foo

Or, if you like to type longer commands, these are equivalent to the above two:

git branch --set-upstream-to=upstream/foo
git branch --set-upstream-to=upstream/foo foo

• As of Git 1.7.0:

git branch --set-upstream foo upstream/foo

Ignore folder that accidentally committed

git rm --cached .idea -r

Git 协作流程

• Gist

常用 Git 命令清单

• 常用 Git 命令清单
• Git教程