diff options
| author | Marc Finet <m.dreadlock@gmail.com> | 2014-09-16 22:07:59 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2014-09-16 23:20:55 +0200 |
| commit | 9c29a4f1f6297d97d4644b074f7246b980751e2b (patch) | |
| tree | 4b45db935d14ebae15506a309ec0f51730b6c166 /ChangeLog | |
| parent | 2c2d4f9627258640df44a4da4e5627e4d8c5044d (diff) | |
| download | zsh-9c29a4f1f6297d97d4644b074f7246b980751e2b.tar.gz zsh-9c29a4f1f6297d97d4644b074f7246b980751e2b.tar.xz zsh-9c29a4f1f6297d97d4644b074f7246b980751e2b.zip | |
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 "?".
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
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 <mikachu@gmail.com> * 33136: Doc/Zsh/expn.yo, Src/glob.c: P glob qualifier appends |