summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-10-31 12:52:46 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-11-13 20:17:51 +0000
commit6198f7ffbae48230561fdd6996358fd553d954db (patch)
tree3829f0909816df33bbefed3855543680b8463f6b /ChangeLog
parentf59864ce7a4a18efbfa5a330895d120ea1ce18f2 (diff)
downloadzsh-6198f7ffbae48230561fdd6996358fd553d954db.tar.gz
zsh-6198f7ffbae48230561fdd6996358fd553d954db.tar.xz
zsh-6198f7ffbae48230561fdd6996358fd553d954db.zip
37031: _git-merge: Exclude ancestors of HEAD from recent commit completion
As done for _git-cherry-pick in a428c6b62cb2 (36328 + 36340).
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f314e82f4..9fd23ada9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-11-13  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 37031: Completion/Unix/Command/_git: _git-merge: Exclude
+	ancestors of HEAD from recent commit completion
+
 	* 37025: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
 	vcs_info git: Add a cherry-pick patch-format