diff options
| author | Cheng Wang <wangchengiscool@gmail.com> | 2021-08-01 17:50:15 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-01 17:50:15 +0800 |
| commit | 3c828982250e5b78de84a1989e23cf10c9bdebf5 (patch) | |
| tree | a0f6707aa77810bd1dc451b82037589e14ff72bb | |
| parent | 1fcbba34f16199cbbe4dab3e1998dc9be36386f4 (diff) | |
Update `git squash` doc
To be consistent with the example code (`squash`) below.
| -rw-r--r-- | contributors/guide/github-workflow.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contributors/guide/github-workflow.md b/contributors/guide/github-workflow.md index 28938326..73fbe74c 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 |