diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2017-06-29 09:39:23 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-29 09:39:23 +0300 |
commit | 942d130a637408ef50be052e5d02fda32067890f (patch) | |
tree | f9635c32377c0eb3cb6f326fc5bab5da035d4c00 /README.md | |
parent | e8c3639097d2faab9b2e75cd3c26e7b63e2b780c (diff) |
Add branch info to README
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,13 @@ # Hugo Docs Documentation site for [Hugo](https://github.com/gohugoio/hugo), the very fast and flexible static site generator built with love in GoLang. + +## Branches + +* The `master` branch is the **current Hugo version** and will be auto-deployed to gohugo.io/](https://gohugo.io/]. +* Anything not relevant for the current Hugo version goes into the `dev` branch. +* Changes in [hugo/docs](https://github.com/gohugoio/hugo/tree/master/docs) will, in general, be merged once every release, but can be manually merged/cherry picked if needed. This goes both ways. +* All contributions that is not tightly coupled with code changes, should be made directly to `hugoDocs`. +* But we also merge PRs into [hugo/docs](https://github.com/gohugoio/hugo/tree/master/docs), but preferably changes that is related to the code in the PR itself + +To summarize, we have two branches in this repository: `master` (current Hugo) and `dev` (next Hugo). |