diff options
| author | Kubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com> | 2021-08-08 07:53:31 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-08 07:53:31 -0700 |
| commit | 30bf55fead69fe78e0bf427e2ba9c5808bcf9b5c (patch) | |
| tree | 97a38319d0942236a3400a35d66a4dd0fd6f8579 | |
| parent | 75bbce98a2bc1911a47bb544f563b8dfaadd845a (diff) | |
| parent | 3c828982250e5b78de84a1989e23cf10c9bdebf5 (diff) | |
Merge pull request #5926 from astraw99/patch-1
Update `git squash` doc
| -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 |