diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 5bf50a499..00896da50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ * 33151: Completion/Unix/Command/_git: completion git: support aliases when \n exist + * 33147: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: detect revert or cherry-pick with multiple commits + 2014-09-12 Barton E. Schaefer <schaefer@zsh.org> * 33143: Src/init.c: POSIX_ARGZERO more closely matches bash et al. diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 76ab92f33..263a3258e 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -62,6 +62,11 @@ VCS_INFO_git_getaction () { return 0 fi + if [[ -d "${gitdir}/sequencer" ]] ; then + gitaction="cherry-or-revert" + return 0 + fi + return 1 } |