This is an easy way to show a pretty git log using alias.
git log --oneline --decorate --all --graphgit config --global alias.tree "log --oneline --decorate --all --graph"Then, use git tree to show the tree view:
使用指令:
git rebase -i 61d3628 -r
onto為rebase指定的commit，此例為61d3628 。
直接編輯各commit的順序及是否生成merge commit，即可隨心所欲整理merge commits.
下圖為將b2的merge拉直的結果
docker image lsdocker pull xxx$ docker build -t imagename:2.0 .docker rmi -f $(docker images -q myname)
# or
docker rmi -f image-namedocker rmi -f $(docker images -aq)docker ps -adocker run -it ubuntu bash
# -d: Run in detached mode
# -v: HOST_PATH:CONTAINER_PATH
# --restart=always
# Stop a specific container
docker stop container_name
# Stop all containers
docker kill $(docker ps -q)# Enter an exited container
docker start myname
docker exec -it myname bash
# Detach from a container
Ctrl-p + Ctrl-q inside the container shell
# Re-attach into an up container shell
docker attach mynamedocker rm -f container_namedocker rm -f $(docker ps -aq)# HOST_PORT:CONTAINER_PORT
docker run -p 8000:8000 myimagedocker cp test.txt mycontainer:/app/test.txtdocker volume ls--volumes-from container_name--link container_name (legacy)
# Then you can ping container_name
# It’s better to create a network and add the containers to the network as below
docker network create network-name
# Creates a bridge network by default
docker tag image-name DockerHubAcc/image-namedocker save myimage > myimage.tar
# Using gzip for compression
docker save myimage:tag | gzip > myimage_tag.tar.gzdocker load < myimage.tardocker export mycontainer > mycontainer.tardocker import mycontainer.tar image-namedocker logs container_name
# Use -f to watch the logsdocker statsdocker container prunedocker system prune --volumes # Only remove dangling images
# -a: Remove all images with no container associatedUse && and \ to chain commands to avoid too many intermediate images get created.
ADD can auto extract .tar.gz and handle remote URL, otherwise use COPY.
Declare auto created volumes using container paths
Only for declaration purpose. docker run -P takes a random port to map to this exposed port.
Most likely the same if used alone. If ENTRYPOINT is used, commands are appended as its arguments (either specified in command line or using CMD. CMD will serve as a default argument in this case)
docker-compose pull# Create all stuffs
docker-compose up -d
# Delete all stuffs
docker-compose down# Start the containers
docker-compose start
# Stop the containers
docker-compose stopdocker-compose logs
docker-compose psgit tag -lgit tag -a v1.0 -m "my version message"git push origin --tagsgit push origin :refs/tags/v1.0將欲取消追蹤的檔案加入.gitignore
在repo中刪除該檔案:
git rm -r --cached .git commit -m "Untrack and delete filename in repo."push到遠端
Step 1: From your project repository, bring in the changes and test.
git fetch origin
git checkout -b steven origin/steven
git merge masterStep 2: Merge the changes and update on GitHub.
git checkout master
git merge --no-ff steven
git push origin masterConflict with binary files:
git checkout --theirs -- path/to/conflicted-file.txt
git checkout --ours -- path/to/conflicted-file.txt由新到舊 D -> C -> B -> A
要把D和C合併成單一個C’
rebase -i <B的SHA-1>
若要rebase初始commit(A):
rebase -i --rootpick <C的SHA-1> C的commit訊息
squash <D的SHA-1> D的commit訊息編輯C’的commit訊息
P.S.若要push到github上則要強迫push:
git push --forcegit config --global user.email "my_email"
git config --global user.name "my_name"git initgit statusgit add .
git add -Agit commit -m “commit message”# 顯示資訊
git remote -v
git remote show origin
# 刪除目前origin
git remote rm origin
# 新增origin
git remote add origin git@github.com:SongRongLee/xxxxx.gitgit push -u origin master
or
git branch -u origin/master
#以後只需要:
git pushgit reset --hard HEAD^
git reset --hard HEAD~2# 以遠端分支為藍本建立本地new-branch
git checkout -b new-branch origin/master# Delete a remote branch
git push -d origin bad-branch
# Delete a local branch
git branch -d bad-branch
# Sync remote branch information after deletion
git fetch --prune
# List all remote and local branches
git branch -a# 修改branch名稱
git branch -m my-new-name# push本地的local-branch到origin/remote-branch
git push origin local-branch:remote-branch# Shows changes from from_branch to to_branch
git diff from_branch to_branch# pull但是保留local change
git stash
git pull
git stash pop
# Stash untracked files
git stash -u
# List all stashes
git stash list
# Pop a certain stash
git stash pop stash@{n}
# Stash with a given message
git stash -m my_messagegit update-ref -d HEADgit resetgit checkout -- filenamegit reset --hard origin/mastergit reset HEAD@{1}git mvgit status --ignoredgit clean -dn # Dry run
git clean -df # Actual removegit reflog