about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b21bdefed..0d81ea3b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2020-03-26  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* 45627: Functions/VCS_Info/Backends/VCS_INFO_get_data_git:
+	vcs_info git: Under git-am(1) conflicts, pass to the
+	gen-applied-string hook information on already-applied patches.
+
 	* 45625: Functions/VCS_Info/Backends/VCS_INFO_get_data_svn:
 	vcs_info svn: Detect the "working copy format is too new" error.