From 7ac34a3055d87b88d8b1b28ddfe68982f6550a08 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 30 Sep 2015 14:21:59 +0000
Subject: 36725: vcs_info git: Compute %b correctly when merging to detached
 heads.

The %b expando should be the hash prior to the merge.  The hash of the merge
result is available as the %i expando and via the gen-applied-string hook.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 498ad7c87..9a755434a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-30  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 36725: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
+	vcs_info git: Compute %b correctly when merging to detached
+	heads.
+
 2015-09-30  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* 36697: Completion/Base/Utility/_arguments: handle options
-- 
cgit 1.4.1