mirror/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-08-30 22:39:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'aa5ac36a3eb68b86c803caec703869efefc8447e'

Browse Source
This commit is contained in:
Bjørn Erik Pedersen
2021-10-31 13:53:55 +01:00
parent 3a977485eb aa5ac36a3e
commit 4b36498a85
162 changed files with 80 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/content/en/contribute/development.md
View File

@@ -336,7 +336,7 @@ pick 33c8973 Begin workflow
pick 3502f2e Refactoring and typo fixes
```
In the case above we should merge the last to commits in the commit of this tutorial (`Add "How to contribute to Hugo" tutorial`). You can "squash" commits, i.e. merge two or more commits into a single one.
In the case above we should merge the last two commits in the commit of this tutorial (`Add "How to contribute to Hugo" tutorial`). You can "squash" commits, i.e. merge two or more commits into a single one.
All operations are written before the commit message. Replace "pick" with an operation. In this case `squash` or `s` for short: