From 66bbcf2d385f66f526d65f315d45a35b788f945c Mon Sep 17 00:00:00 2001 From: yearnZero Date: Sun, 15 Jul 2018 23:05:25 +0800 Subject: [PATCH] fix typo --- Git/git-en.md | 4 ++-- Git/git-zh.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Git/git-en.md b/Git/git-en.md index cfb2d6c7..d48d6994 100644 --- a/Git/git-en.md +++ b/Git/git-en.md @@ -28,9 +28,9 @@ You should use `rebase` on the local branchs which need be rebased. If you need ```shell ## branch develop git rebase master -get checkout master +git checkout master ## move HEAD on `master` to the latest commit -get merge develop +git merge develop ``` ## stash diff --git a/Git/git-zh.md b/Git/git-zh.md index 3f861c9c..6cd109b3 100644 --- a/Git/git-zh.md +++ b/Git/git-zh.md @@ -30,9 +30,9 @@ Rebase 对比 merge,优势在于合并后的结果很清晰,只有一条线 ```shell ## branch develop git rebase master -get checkout master +git checkout master ## 用于将 `master` 上的 HEAD 移动到最新的 commit -get merge develop +git merge develop ``` ## stash