git command line operation (before finishing notes in the proper way)

1. commonly used commands

Handover branch git checkout [branch_name]

The detection branch git clone [git_URL]

Update branch git pull origin [branch_name]

Resolve conflicts

Upload git add [file] git commit -m " comment"

Tags git tag to view all the current branch label

Notes playing tag git tag -a [version] -m " [messages]"

Temporarily not in use

Merge

Check local branch   git branch

View warehouse branch   git branch -r

Delete branch       git branch -d [branch_name]

View warehouse       git remote -v

View diff git diff [NAME / PATH] Workspace and compare staging area

git diff HEAD [NAME / PATH] Workspace and compare HEAD

View log git log

 

 

Add tags and annotated

 git tag -a v1.0 -m 'this is test version 1.0'

 

git push --tags push all the tags to the server, it will be all branches

 

Branches merge (e.g., the A to merge B)

Switch to B branch git checkout B

Merge branch A to B git merge A

If a conflict occurs, use View git status

 

After ending the conflict may need to git commit submitted once (usually developed to resolve the conflict to do)

 

 

2. Note the question:

Command line operations better or there is a great risk, reduce operational, caution

Guess you like

Origin www.cnblogs.com/chenadong/p/11298328.html