summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2007-07-02 15:47:53 +0000
committerClint Adams <clint@users.sourceforge.net>2007-07-02 15:47:53 +0000
commit58b9d6573dbfeec21a9087a7190b17f5e082f184 (patch)
tree64880f880a8a538f79741b55a1460b88ed7fdc8f /ChangeLog
parent2dfb0d5af4f8e5dae544c520802f3ba05a90b071 (diff)
downloadzsh-58b9d6573dbfeec21a9087a7190b17f5e082f184.tar.gz
zsh-58b9d6573dbfeec21a9087a7190b17f5e082f184.tar.xz
zsh-58b9d6573dbfeec21a9087a7190b17f5e082f184.zip
23639: merge in git merge-tree completion from Nikolai Weibull's repository.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 53f95a953..5e0fa12e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-07-02  Clint Adams  <clint@zsh.org>
 
+	* 23639: Completion/Unix/Command/_git: merge in git merge-tree
+	completion from Nikolai Weibull's repository.
+
 	* 23629: Etc/FTP-README: change references to "beta" to "dev" or
 	"development".