diff --git a/_posts/2022-03-14-Alias-For-Git-And-Docker .md b/_posts/2022-03-14-Alias-For-Git-And-Docker .md index b7e52b9..b19f54e 100644 --- a/_posts/2022-03-14-Alias-For-Git-And-Docker .md +++ b/_posts/2022-03-14-Alias-For-Git-And-Docker .md @@ -94,9 +94,10 @@ Git 命令,则可以设置在 `~/.gitconfig` 内: # fop = fetch origin -p # merge - mr = merge - mnc = merge --no-commit - # msq = merge --squash + mgff = merge --ff + mgnoff = merge --no-ff + mgnc = merge --no-commit --no-ff + # mgsq = merge --squash # commit ci = commit