Commit28d6a26

and

committed

precommit warns on main + instructions for fix in docs

Co-authored-by: Greg Lucas <greg.m.lucas@gmail.com>

1 parent0b8bd96 commit28d6a26Copy full SHA for 28d6a26

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,11 @@ repos:`
`23`	`23`	`-id:mixed-line-ending`
`24`	`24`	`-id:name-tests-test`
`25`	`25`	`args:["--pytest-test-first"]`
	`26`	`+ -id:no-commit-to-branch#default is master and main`
	`27`	`+name:no commit to main branch. See "https://matplotlib.org/devdocs/devel/development_workflow.html#make-a-new-feature-branch"`
`26`	`28`	`-id:trailing-whitespace`
`27`	`29`	`exclude_types:[svg]`
	`30`	`+`
`28`	`31`	`-repo:https://github.com/pycqa/flake8`
`29`	`32`	`rev:6.0.0`
`30`	`33`	`hooks:`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
@@ -63,6 +63,11 @@ what the changes in the branch are for. For example ``add-ability-to-fly``, or
`63`	`63`	`git branch my-new-feature upstream/main`
`64`	`64`	`git checkout my-new-feature`
`65`	`65`
	`66`	+If you started making changes on your local ``main`` branch, you can rename the
	`67`	`+branch to a feature branch::`
	`68`	`+`
	`69`	`+ git branch -m <newname>`
	`70`	`+`
`66`	`71`	`Generally, you will want to keep your feature branches on your public GitHub`
`67`	`72`	fork of Matplotlib. To do this, you ``git push`` this new branch up to your
`68`	`73`	`GitHub repo. Generally (if you followed the instructions in these pages, and by`
`@@ -79,6 +84,7 @@ In git >= 1.7 you can ensure that the link is correctly set by using the`
`79`	`84`	From now on git will know that ``my-new-feature`` is related to the
`80`	`85`	``my-new-feature`` branch in the GitHub repo.
`81`	`86`
	`87`	`+`
`82`	`88`	`.. _edit-flow:`
`83`	`89`
`84`	`90`	`The editing workflow`

Comments

(0)