summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-10-25 18:34:08 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-10-25 18:47:11 +0000
commit17af119089379ec1b65b327c72eee3aac93fada7 (patch)
treeb136f00d5a49d050fcc28cd7a4dcdaaac16171d7 /ChangeLog
parentf8b2c13c97228c9a1a0319f07d1ae7c1268e12db (diff)
downloadzsh-17af119089379ec1b65b327c72eee3aac93fada7.tar.gz
zsh-17af119089379ec1b65b327c72eee3aac93fada7.tar.xz
zsh-17af119089379ec1b65b327c72eee3aac93fada7.zip
36958: _git: Fix recent commit completion descriptions.
The uniquifiers 'HEAD~$n' were incorrect when a recent commit was the second
parent of a merge commit.  Detect that case and print something correct
instead.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 812ef3540..234f26f11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-10-25  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 36958: Completion/Unix/Command/_git: _git: Fix recent commit
+	completion descriptions.
+
 	* unposted: Completion/Unix/Command/_git: _git: Fix 'commit
 	object name' completion messages.