X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=doc%2Fwebserver%2Fdeveloper-manual%2Fgit.html;h=c455df4867181257ef572fb5286e9ae93e7dfafe;hp=0e64e1f23c9f9c7156b6ce5d501fe0ecfcee20aa;hb=dd8fb8e27e27aa0aad57d6b887192f5285825f65;hpb=1f8e678f82936f21347922e1b2428ac00cd4d34e diff --git a/doc/webserver/developer-manual/git.html b/doc/webserver/developer-manual/git.html index 0e64e1f2..c455df48 100644 --- a/doc/webserver/developer-manual/git.html +++ b/doc/webserver/developer-manual/git.html @@ -1,291 +1,105 @@ - -
If you become part of the active development team, you will eventually - need write access to our holy grail, the Git repository. One of the - team members will need to set this up for you. Please read - this chapter completely before accessing via Git. -
The project's Git repository is hosted at the - Privoxy site. - The Git repository URL is - ssh://git@git.privoxy.org:23/git/privoxy.git, - the central repository is called privoxy, and the - source branch is called master. Subfolders exist - within the project for target-dependent build and packaging tools, each - including the name of the target operating system in their name (e.g. - Windows, OSXPackageBuilder, debian). There is a webview of the Git - hierarchy at - https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree, - which might help with visualizing how these pieces fit together. -
Whilst the central repository contains only the master branch, developers - are of course free to create branches in their local repositories as they - develop features, fixes, or update the target-dependent tools. Only once - such changes are fully tested ought they be pushed back to the central - repository master branch. -
At one time there were two distinct branches: stable and unstable. The - more drastic changes were to be in the unstable branch. These branches - have now been merged to minimize time and effort of maintaining two - branches. -
The source tree is the heart of every software project. Every effort must - be made to ensure that it is readable, compilable and consistent at all - times. We expect anyone with Git access to strictly - adhere to the following guidelines: -
Basic Guidelines, for all branches: -
Please don't commit even - a small change without testing it thoroughly first. When we're - close to a public release, ask a fellow developer to review your - changes. -
Your commit message should give a concise overview of what you - changed (no big details) and why you changed it - Just check previous messages for good examples. -
Don't use the same message on multiple files, unless it equally applies to - all those files. -
If your changes span multiple files, and the code won't recompile unless - all changes are committed (e.g. when changing the signature of a function), - then commit all files one after another, without long delays in between. - If necessary, prepare the commit messages in advance. -
Before changing things on Git, make sure that your changes are in line - with the team's general consensus on what should be done. -
Note that near a major public release, we get more cautious. - There is always the possibility to submit a patch to the patch - tracker instead. -
If you become part of the active development team, you will eventually need write access to our holy grail, the + Git repository. One of the team members will need to set this up for you. Please read this chapter completely + before accessing via Git.
+The project's Git repository is hosted at the Privoxy + website. For Privoxy team members with push privileges the Git repository URL is ssh://git@git.privoxy.org:23/git/privoxy.git.
+Contributors without push privileges can "git clone + https://www.privoxy.org/git/privoxy.git".
+The central repository is called privoxy, and the source branch is called master. Subfolders exist within the project for target-dependent build and packaging tools, each + including the name of the target operating system in their name (e.g. Windows, OSXPackageBuilder, debian). There + is a webview of the Git hierarchy at https://www.privoxy.org/gitweb/?p=privoxy.git;a=tree, which might help with visualizing how these + pieces fit together.
+Whilst the central repository contains only the master branch, developers are of course free to create + branches in their local repositories as they develop features, fixes, or update the target-dependent tools. Only + once such changes are fully tested ought they be pushed back to the central repository master branch.
+At one time there were two distinct branches: stable and unstable. The more drastic changes were to be in the + unstable branch. These branches have now been merged to minimize time and effort of maintaining two branches.
+The source tree is the heart of every software project. Every effort must be made to ensure that it is + readable, compilable and consistent at all times. We expect anyone with Git access to strictly adhere to the + following guidelines:
+Basic Guidelines, for all branches:
+Please don't commit even a small change without testing it thoroughly first. When we're close to a public + release, ask a fellow developer to review your changes.
+Your commit message should give a concise overview of what you + changed (no big details) and why you changed + it Just check previous messages for good examples.
+Don't use the same message on multiple files, unless it equally applies to all those files.
+If your changes span multiple files, and the code won't recompile unless all changes are committed (e.g. + when changing the signature of a function), then commit all files one after another, without long delays in + between. If necessary, prepare the commit messages in advance.
+Before changing things on Git, make sure that your changes are in line with the team's general consensus + on what should be done.
+Note that near a major public release, we get more cautious. There is always the possibility to submit a + patch to the patch tracker instead.
+