Git Cheat-Sheet

git init      # initialize local repository (create new repository)
git config --global user.name "xxx"     # config  username
git config --global user.email "[email protected]"           # config email 
git commit --amend –reset-author #modify author and mail for last commit
git replace 03f482d6 42627abe #modify author for specific commit
git clone git+ssh://[email protected]/VT.git     #clone remote repository
git status                     #check current status
git add xyz.txt                #add xyz.txt to index
git add .                      #add current folder’s all files to index
git commit -m 'message content'                                       
git commit --amend -m 'message content'    # merge last commit 
git commit -am 'xxx'           #merge add and commit to one step 
git rm xyz.txt                 # remove  xyz.txt from index
git rm -r *                    #recursive delete
git log                        #display log 
git log -2                     #display one item of log, -n means how many
git log --stat                 #display log and relative files
git log –-pretty=oneline       #display log information in oneline style
git log -p -m
git show dfb02e6e4f2f7b572e392818   #show the detail of specified comment
git show dfb02                      #可只用commitid的前几位
git show HEAD                       #显示HEAD提交日志
git show HEAD^   # show parent commit log^^为上两个版本 ^5为上5个版本
git tag                                 #显示已存在的tag
git tag -a v2.0 -m 'xxx'                                 # 增加v2.0的tag
git tag –a v1.1 c3dfg56 –m ”new tag”
git push origin v2.0                    # 把v2.0推送到远程仓库
git push --tags                         # 把所有tag推送到远程仓库
git tag –d v2.0                         # delete local tag 
git push –-delete origin v2.0           # delete remote tag
git reset –hard v2.0
git show v2.0                         #显示v2.0的日志及详细内容
git log v2.0                          #显示v2.0的日志
git diff                                # 显示所有未添加至index的变更
git diff --cached                       # 显示所有已添加index但还未commit的变更
git diff HEAD^                          # 比较与上一个版本的差异
git diff HEAD -- ./lib                  # 比较与HEAD版本lib目录的差异
git diff origin/master..master     # 比较远程分支master上有本地分支master上没有的
git diff origin/master..master --stat   # 只显示差异的文件，不显示具体内容
git remote add origin git+ssh://[email protected]/VT.git # 增加远程定义（用于push/pull/fetch）
git branch                              # 显示本地分支
git branch --contains 50089                          # 显示包含提交50089的分支
git branch feature/test c3dfg56
git branch -a                           # 显示所有分支
git branch -r                           # 显示所有原创分支
git branch --merged                     # 显示所有已合并到当前分支的分支
git branch --no-merged                  # 显示所有未合并到当前分支的分支
git branch -m master master_copy        # 本地分支改名
git checkout -b master_copy             # 从当前分支创建新分支master_copy并检出
git checkout -b master master_copy      # 上面的完整版
git checkout features/performance       # 检出已存在的features/performance分支
git checkout --track hotfixes/BJVEP933   # 检出远程分支hotfixes/BJVEP933并创建本地跟踪分支
git checkout v2.0                                         # 检出版本v2.0
git checkout -b develop origin/develop  #从远程分支develop创建新本地分支devel并检出
git checkout -- README             # 检出head版本的README文件（可用于修改错误回退）
git merge origin/master            # 合并远程master分支至当前分支
git cherry-pick ff44785404a8e      # 合并提交ff44785404a8e的修改
git push origin master              # 将当前分支push到远程master分支
git push --set-upstream origin release/cp-core-services-rel-3.x  #current branch no upstream branch
git fetch                          # 获取所有远程分支（不更新本地分支，另需merge）
git fetch --prune                  # 获取所有原创分支并清除服务器上已删掉的分支
git pull origin master             # 获取远程分支master并merge到当前分支
git pull –p                            #pull from origin with deleted remote branch
git mv README README2               # 重命名文件README为README2
git reset --hard HEAD                # 将当前版本重置为HEAD（通常用于merge失败回退）
git reset --hard c3dfg56 #reset current branch to specific commit
git rebase
git branch -d hotfixes/test      # 删除本地分支（本分支修改已合并到其他分支）
git branch -D hotfixes/test     # 强制删除本地分支hotfixes/test
git push origin --delete hotfix/test #删除remote分支
git ls-files                        # 列出git index包含的文件
git show-branch                      # 图示当前分支历史
git show-branch --all                # 图示所有分支历史
git whatchanged                       # 显示提交历史对应的文件修改
git revert dfb02e6e4f2f7b573337763e5c0013802e392818       # 撤销提交dfb02e6e4f2f7b573337763e5c0013802e392818
git ls-tree HEAD                     # 内部命令：显示某个git对象
git rev-parse v2.0                                       # 内部命令：显示某个ref对于的SHA1 HASH
git reflog                           # 显示所有提交，包括孤立节点
git show HEAD@{5}
git show master@{yesterday}           # 显示master分支昨天的状态
git log --pretty=format:'%h %s' --graph      # 图示提交日志
git show HEAD~3
git show -s --pretty=raw 2be7fcb476
git stash                                    # 暂存当前修改，将所有至为HEAD状态
git stash list                               # 查看所有暂存
git stash show -p stash@{0}                  # 参考第一次暂存
git stash apply stash@{0}                   # 应用第一次暂存
git grep "delete from"                                    # 文件中搜索文本“delete from”
git grep -e '#define' --and -e SORT_DIRENT
git gc
git fsck
git format-patch -1 HEAD 
git format-patch -1 1cd79e653d9c2553e18f1027a3b1edd9a7693877 
git format-patch -10 HEAD --stdout > 0001-last-10-commits.patch
git apply --stat file.patch  #show status before applying
git apply --check file.patch  #check for error before applying  
git am --signoff file.patch  #apply the patch and sign off an applied patch

git blame –L150,+2 Test.java
git log --pretty=short -u -L 150,150:Test.java