summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-07-06 14:03:47 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-07-06 14:03:55 +0000
commite81f61ea9a794e9e9ba106298c354b00293ff42c (patch)
tree207c2aaca47653c1b87b354244b2713a3392cec1
parent26d5d2eeac733bcaf9a4bdcb5e9af72b69474899 (diff)
downloadzsh-e81f61ea9a794e9e9ba106298c354b00293ff42c.tar.gz
zsh-e81f61ea9a794e9e9ba106298c354b00293ff42c.zip
35441: Make devs' ChangeLog generator scripts discoverable
-rw-r--r--ChangeLog5
-rw-r--r--Etc/zsh-development-guide13
2 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0df3589a2..bf8aeb54c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-06 Daniel Shahaf <d.s@daniel.shahaf.name>
+
+ * 35441: Etc/zsh-development-guide: Make devs' ChangeLog
+ generator scripts discoverable
+
2015-07-05 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 35692: Src/Zle/computil.c: cfp_matcher_range used wrong raw
diff --git a/Etc/zsh-development-guide b/Etc/zsh-development-guide
index 7f5266bd9..d92b72456 100644
--- a/Etc/zsh-development-guide
+++ b/Etc/zsh-development-guide
@@ -70,6 +70,19 @@ avoided further changes to our workflow.
a commit to the master repository. Don't create a separate change for
this: amend the existing commit in your local repository.
+ Several developers use scripts to automate part or all of the ChangeLog
+ workflow:
+
+ Subject: helper script for making ChangeLog entries
+ X-Seq: 33835, 33872, 34912
+ http://www.zsh.org/mla/workers/2014/msg01622.html
+ http://www.zsh.org/mla/workers/2014/msg01659.html
+ http://www.zsh.org/mla/workers/2015/msg00836.html
+
+ Subject: Re: _git commit object name completion
+ X-Seq: 35414
+ http://www.zsh.org/mla/workers/2015/msg01338.html
+
* Do not merge your private feature branches onto the master branch: a
linear history without merge commits is simpler to follow (and to
bisect).