summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorØystein Walle <oystwa@gmail.com>2014-09-16 10:28:11 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2014-09-23 22:26:22 +0200
commit95a6d965c556807a7aa16490f92f48b77bf8b6ce (patch)
tree7fb0ee6e6314d4563c800130ee6acd9da774e21d /ChangeLog
parent93702691ec6ba9b4f863c96c9ebade198990f702 (diff)
downloadzsh-95a6d965c556807a7aa16490f92f48b77bf8b6ce.tar.gz
zsh-95a6d965c556807a7aa16490f92f48b77bf8b6ce.tar.xz
zsh-95a6d965c556807a7aa16490f92f48b77bf8b6ce.zip
33180: _git: add missing --3way option
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f17f5f26..6fe3be9a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 
 	* 33177: Completion/Unix/Command/_git: _git: fix typo in git-apply
 
+	* 33180: Completion/Unix/Command/_git: _git: add missing --3way
+	option
+
 2014-09-23  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: NEWS: more minor tweaks.