X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/7ed1c9bae22c19aa50ec60dd0735721e711c0b0d..43a65e9777214029046fe7a1427493e6e503a717:/docs/README.developers?ds=sidebyside

diff --git a/docs/README.developers b/docs/README.developers
index e8470189..86b2f897 100644
--- a/docs/README.developers
+++ b/docs/README.developers
@@ -31,7 +31,7 @@ or other related files, you'll need to first install GNU m4, available
 from <ftp://ftp.gnu.org/pub/gnu/m4/>, then GNU autoconf
 (<ftp://ftp.gnu.org/pub/gnu/autoconf/>) and GNU automake
 (<ftp://ftp.gnu.org/pub/gnu/automake/>).  Nmh is currently using a
-minimum of autoconf 2.61 and automake 1.12.
+minimum of autoconf 2.68 and automake 1.12.
 
 Most of the configure-related files are automatically generated.
 The only files you should need to manually edit are configure.ac
@@ -120,15 +120,32 @@ git
 As of December 2010, nmh has switched to using git for revision control
 instead of CVS.  While the topic of git is beyond the scope of this FAQ,
 to get started with git & nmh, you can run the following command to checkout
-the nmh repository:
+the nmh repository (with read-only access to it):
 
     % git clone git://git.savannah.nongnu.org/nmh.git
 
-That will create a workspace call nmh.  To update that workspace
+That will create a workspace called nmh.  To update that workspace
 with changes to the master, cd to it and run:
 
     % git pull
 
+If you are a project member and want write access to the repository,
+you'll have to checkout with the following command instead of the one
+above:
+
+    % git clone <username>@git.sv.nongnu.org:/srv/git/nmh.git
+
+We suggest using git pull --rebase instead of the default merge for
+git pull.  If you don't want to add the --rebase option every time,
+you can tell git pull to always rebase in your nmh workspace by
+cd'ing to it and running the following command:
+
+    % git config --bool branch.master.rebase true
+
+And you'll probably want the following, also, so that --rebase applies
+to any new branches that you create:
+
+    % git config branch.autosetuprebase always
 
 -------------------------------------------------------
 nmh-local functions to use in preference to OS versions