From 0f4a8f01fc6c0843cc81850271078ff242cdaffb Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 13 Aug 2014 08:02:56 -0700 Subject: [PATCH] * CONTRIBUTING: Clarify how to repeat the git workflow. * NEWS: Thanks. --- CONTRIBUTING | 6 ++++-- NEWS | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index 508071b..5586ec8 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -31,7 +31,8 @@ Git repository. If you use Git the following workflow may be helpful: git checkout master git pull - * Switch to a new branch for the changes. + * Switch to a new branch for the changes. Choose a different + branch name for each change set. git checkout -b mybranch @@ -60,7 +61,8 @@ Git repository. If you use Git the following workflow may be helpful: git send-email master - * Start anew by getting current with the master branch again. + * Start anew by getting current with the master branch again + (the second step above). Please do not create issues or pull requests on Github, as the proper procedure for proposing and distributing patches is via diff --git a/NEWS b/NEWS index f7033cc..8670c3a 100644 --- a/NEWS +++ b/NEWS @@ -52,8 +52,8 @@ Unreleased, experimental changes Changes affecting documentation and commentary - A new file CONTRIBUTING is distributed. (Thanks to Tim Parenti - for suggesting a CONTRIBUTING file.) + A new file CONTRIBUTING is distributed. (Thanks to Tim Parenti for + suggesting a CONTRIBUTING file, and to Walter Harms for debugging it.) tz-link.htm mentions Windows Runtime etc. (thanks to Matt Johnson) and HP-UX's tztab. -- 1.9.1