Skip to content

Commit

Permalink
Rename default branch to main
Browse files Browse the repository at this point in the history
The development is switching from git-flow to a trunk based model
because the overhead of git-flow was not needed for the size of the
project.
  • Loading branch information
lucc committed Dec 1, 2023
1 parent 82cfc4b commit 369106c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
11 changes: 0 additions & 11 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ Feature requests

Please stick to the following standards when you open pull requests:

- Khard's development tries to follow `Vincent's branching model`_ so normal
pull requests should be made against the `develop`_ branch. Only important
bug fixes that affect the current release should be opened against `master`_.
- Write "good" commit messages, especially a proper subject line. This is also
explained in `the Git book`_.
- Format your python code according to `PEP 8`_. Tools like `pylint`_ also
Expand All @@ -47,13 +44,6 @@ Please stick to the following standards when you open pull requests:
Development
-----------

In order to start coding you need to fetch the ``develop`` branch:

.. code-block:: shell
git clone https://github.com/lucc/khard
cd khard
It is recommended to create a `virtualenv`_ to isolate the development
environment for Khard from your system's Python installation:

Expand All @@ -75,7 +65,6 @@ dependencies with ``nix develop``.

.. _bug reports: https://github.com/lucc/khard/issues
.. _the Git book: https://www.git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_commit_guidelines
.. _develop: https://github.com/lucc/khard/tree/develop
.. _feature requests: https://github.com/lucc/khard/pulls
.. _Github: https://github.com/lucc/khard
.. _master: https://github.com/lucc/khard/tree/master
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ doc = ['sphinx', 'sphinx-autoapi', 'sphinx-autodoc-typehints']
homepage = "https://github.com/lucc/khard"
documentation = "https://khard.readthedocs.io/en/latest/"
repository = "https://github.com/lucc/khard.git"
changelog = "https://github.com/lucc/khard/blob/develop/CHANGES"
changelog = "https://github.com/lucc/khard/blob/main/CHANGES"

[project.scripts]
khard = "khard.khard:main"
Expand Down

0 comments on commit 369106c

Please sign in to comment.