kubernetes
/
community
mirror of https://github.com/kubernetes/community.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5926 from astraw99/patch-1 

Update `git squash` doc
This commit is contained in:
Kubernetes Prow Robot 2021-08-08 07:53:31 -07:00 committed by GitHub
parent 75bbce98a2 3c82898225
commit 30bf55fead
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contributors/guide/github-workflow.md
View File

@ -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