about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-16 17:56:15 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-16 17:56:15 +0000
commit71b215074ad70ad63f076cb2b1fa306ee98f1128 (patch)
tree74d7b35691acbd0d39b744ff42eeb6d1313d2680 /ChangeLog
parent9a9759e3407e89a1abe690f66bef90788b934628 (diff)
downloadzsh-71b215074ad70ad63f076cb2b1fa306ee98f1128.tar.gz
zsh-71b215074ad70ad63f076cb2b1fa306ee98f1128.tar.xz
zsh-71b215074ad70ad63f076cb2b1fa306ee98f1128.zip
25463: patch to add git completion for --base/-1, --ours/-2 and --theirs/-3, from Mikael Magnusson.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d8955503c..e53903002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-08-16  Clint Adams  <clint@zsh.org>
 
+	* 25463: Completion/Unix/Command/_git: patch to add git
+	completion for --base/-1, --ours/-2 and --theirs/-3, from
+	Mikael Magnusson.
+
 	* 25462: Completion/Unix/Command/_git: patch to add some -s -w
 	to _arguments and new options for revert, from Mikael Magnusson.