From 880579dc1e368bd6111b6f2d4c4449f4d42cd1b3 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Thu, 3 Sep 2015 09:24:16 +0000 Subject: 36410: vcs_info git: Present merge heads as patches This shows, during 'git merge', the revision hashes of the "remote" head (the one that will become second parent of the commit) in the %m expando. Review-by: Frank Terbeck --- ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index bb2d507c2..05d6999ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-09-05 Daniel Shahaf + + * 36410: Doc/Zsh/contrib.yo + Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: + Present merge heads as patches + 2015-09-04 Peter Stephenson * 36421: Src/pattern.c: can't-get-the-staff fix for idiocy in -- cgit 1.4.1