summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
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.