From 9c29a4f1f6297d97d4644b074f7246b980751e2b Mon Sep 17 00:00:00 2001 From: Marc Finet Date: Tue, 16 Sep 2014 22:07:59 +0200 Subject: 33184: vcs_info git: consider patches for rebase Since a rebase contains a list of patches to re-apply, re-use the facility for stgit to have the same mechanism. The patch list given to the gen-{un,}applied-string hooks is an array with the sha1 and the subject of the commit. On rebase merge, the applied patches prior to current contains only a number and "?". --- ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 037604772..7d1ea2b23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,10 @@ * 33188: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: set rrn before using it + * 33184: Doc/Zsh/contrib.yo, + Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: + consider patches for rebase + 2014-09-16 Mikael Magnusson * 33136: Doc/Zsh/expn.yo, Src/glob.c: P glob qualifier appends -- cgit 1.4.1