From c0351b6a01959bac3aded45199ec6dfd7130b4a8 Mon Sep 17 00:00:00 2001 From: wsdjeg Date: Sat, 20 Jan 2018 16:39:54 +0800 Subject: [PATCH] Update dev doc --- docs/development.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/development.md b/docs/development.md index d0ed327fe..777d844b8 100644 --- a/docs/development.md +++ b/docs/development.md @@ -86,7 +86,7 @@ PR = Pull-Request ##### Ideally for simple PRs (most of them): -- Branch from `dev` +- Branch from `master` - One topic per PR - One commit per PR - If you have several commits on different topics, close the PR and create one PR per topic @@ -100,6 +100,7 @@ Those PRs are usually cherry-picked. Squash only the commits with uninteresting changes like typos, syntax fixes, etc… and keep the important and isolated steps in different commits. Those PRs are merged and explicitly not fast-forwarded. + Commit messages Write commit messages according to adapted [Tim Pope’s guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html):