From 5d82b9e88b24e5d913844a68e7c940d70f120a01 Mon Sep 17 00:00:00 2001 From: Marcin Sobczyk Date: Thu, 14 Mar 2024 13:11:51 +0100 Subject: [PATCH] doc: Add git commits guide Signed-off-by: Marcin Sobczyk --- doc/development.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/development.md b/doc/development.md index bc1195ade4..7619715a42 100644 --- a/doc/development.md +++ b/doc/development.md @@ -332,4 +332,13 @@ vertically aligned. # must have a special rule to queue I/O when all paths have failed, and # accessing it in Vdsm commands may hang Vdsm. -``` \ No newline at end of file +``` + +### Git commits + +We cultivate a discipline of clean, linear git history that dates back to +[gerrit](https://gerrit.ovirt.org/q/project:vdsm+is:merged) days. Commit messages +matter - we have a +[template](https://github.com/oVirt/vdsm/blob/master/commit-template.txt) for +them. Every commit should be atomic and releasable. We don't use merge commits - +we use rebasing.