[Git][NTPsec/ntpsec][master] add more Git advice to devel/hacking.txt

[Mark Atwood]

Mark Atwood pushed to branch master at NTPsec / ntpsec


Commits:
17e99336 by Mark Atwood at 2017-01-04T15:56:17-08:00
add more Git advice to devel/hacking.txt

- - - - -


1 changed file:

- devel/hacking.txt


Changes:

=====================================
devel/hacking.txt
=====================================
--- a/devel/hacking.txt
+++ b/devel/hacking.txt
@@ -378,6 +378,23 @@ C was the minor.  They also use release-candidate suffixes.
 
 == Contribution workflow and conventions ==
 
+Please work on one piece of conceptual work at a time.
+
+Please make sure your code builds and passes the test suite before you
+commit it, and especially before you push it.
+
+Before starting significant work, propose it first in the
+mailto:devel at ntpsec.org mailing list.  Other people may have
+suggestions, will want to collaborate, and will wish to review your
+code.
+
+=== Git ===
+
+We use Git as our distributed version control system.
+
+If you ever get stuck or confused while using Git, please consult
+http://ohshitgit.com/
+
 === GitLab.com ===
 
 We use GitLab.com as our forge.
@@ -398,14 +415,6 @@ of the Project Manager, after consulting with the existing core team.
 Generally, other levels of access will not be granted, as they are not
 necessary to be a welcome and effective contributor.
 
-Please work on one piece of conceptual work at a time.  Keep each
-narrative of work each in a different branch.
-
-Before starting significant work, propose it first in the
-mailto:devel at ntpsec.org mailing list.  Other people may have
-suggestions, will want to collaborate, and will wish to review your
-code.
-
 === Optional: Send patches by email ===
 
 If you do not want to use GitLab pull requests, we welcome simple fix



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/17e993361df8abed90838ebfa3654496a2cab634
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170104/f6c5afb8/attachment.html>