From 3c828982250e5b78de84a1989e23cf10c9bdebf5 Mon Sep 17 00:00:00 2001 From: Cheng Wang Date: Sun, 1 Aug 2021 17:50:15 +0800 Subject: [PATCH] Update `git squash` doc To be consistent with the example code (`squash`) below. --- contributors/guide/github-workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contributors/guide/github-workflow.md b/contributors/guide/github-workflow.md index 28938326e..73fbe74c5 100644 --- a/contributors/guide/github-workflow.md +++ b/contributors/guide/github-workflow.md @@ -197,7 +197,7 @@ rebase](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History): ``` -3. Use a command line text editor to change the word `pick` to `fixup` for the commits you want to squash, then save your changes and continue the rebase: +3. Use a command line text editor to change the word `pick` to `squash` for the commits you want to squash, then save your changes and continue the rebase: ``` pick 2ebe926 Original commit