Git 常用命令

   >> git --help

The most commonly used git commands are:

   add        Add file contents to the index

   bisect     Find by binary search the change that introduced a bug

   branch     List, create, or delete branches

   checkout   Checkout a branch or paths to the working tree

   clone      Clone a repository into a new directory

   commit     Record changes to the repository

   diff       Show changes between commits, commit and working tree, etc

   fetch      Download objects and refs from another repository

   grep       Print lines matching a pattern

   init       Create an empty Git repository or reinitialize an existing one

   log        Show commit logs

   merge      Join two or more development histories together

   mv         Move or rename a file, a directory, or a symlink

   pull       Fetch from and integrate with another repository or a local branch

   push       Update remote refs along with associated objects

   rebase     Forward-port local commits to the updated upstream head

   reset      Reset current HEAD to the specified state

   rm         Remove files from the working tree and from the index

   show       Show various types of objects

   status     Show the working tree status

   tag        Create, list, delete or verify a tag object signed with GPG

中文git教程

基本操作 （本地推送到远程； 远程下载到本地）

1 adding new files from local directory and push them to the remote repository

git add files ;   git commit -m "adding files";  git push 

2 update local directory from remote repository

git pull

常见的2个问题(pull冲突）：

your branch and "origion/master" have diverged, answers from stackoverflow

you have not concluded your merge(MEGER_HEAD) exists, answers from stack overflow