push a folder
git remote add origin https://gitlab.com/xxxxx/test.git
git add .
git commit -m “Initial commit”
git push -u origin master # git push <remote-repo> <branch-name>
view repo's history
git log
git log --oneline
git log --stat # display the files that have been changed in the commit, as well as the number of lines that have been added or deleted
git log -p # display the actual changes made to a file
git log -p <SHA>
git show
git show <SHA>
git diff # see changes that have been made but haven't been committed
git log --oneline --graph --decorate --all
git log --author="Richard Kalehoff"
git log --grep="border radius issue in Safari"
branch
git branch # list all branch
git branch sidebar # create new branch called sidebar
git checkout sidebar # switch to branch sidebar
git branch -d sidebar # delete
git checkout -b footer master # create new branch and switch to it
git checkout -b footer <SHA>
merge
git merge <branch-name> # merge <branch-name> into current branch
# to fix conflict:
# open editor and fixed it
# commit again
amend commit
git commit --amend
# if Working Directory is clean
# change the commit message
# else
# update all change within the staging area
git revert <SHA-of-commit-to-revert>
沒有留言:
張貼留言