1、设置当前分支为默认分支:
git branch --set-upstream-to=origin/master
2、To push the current branch and set the remote as upstream, use:
git push --set-upstream origin eds_enhancement
3、同步远程分支
git remote update --prune [remote]
4、Remove a file from a Git repository without deleting it from the local filesystem
For single file:
git rm --cached mylogfile.log
For single directory:
git rm --cached -r mydirectory
5 undo git add . from staged
git reset
git reset <file path>
or undo all staged files:
git reset HEAD .
6 commit to gateWay
git push origin HEAD:refs/for/19.1.1_sparkle
7 撤销提交
git revert [commit id]
8 查看文件变动
git show --name-only {commit}
9 squash commits to one(将多个commits压成一个)
git rebase -i [commit-id (not contained it)]
note:
select by `s` short command
10 在最近的commit上追加文件变动
git add the_left_out_file
git commit --amend --no-edit
or
git reset HEAD^
git add again
11 撤回部分file的commit
step 1: git reset --soft HEAD^1
step 2: git reset <file path>
git rm --cached <file-name>(如果要刪除此文件)
12 恢复reset
git reflog
13 list all conflict files
git diff --name-only --diff-filter=U
14 add message to stash command
git stash save <messages>
15 rebase local branch with remote master
step1: git fetch origin # Updates origin/master
step2: git rebase origin/master # Rebases current branch onto origin/master
16 change commit message to latest commit
git commit --amend -m "New commit message."
17 git log --author=<author name>
18 git alias
git config --global alias.p 'push'
git p