diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-09-30 14:21:59 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2015-09-30 21:43:37 +0000 |
| commit | cd1cda9d57ff9f44d285bcd867721c4024500837 (patch) | |
| tree | 56ae927c1ce8043ede14690790f3beaed6eb2166 /ChangeLog | |
| parent | 7ac34a3055d87b88d8b1b28ddfe68982f6550a08 (diff) | |
| download | zsh-cd1cda9d57ff9f44d285bcd867721c4024500837.tar.gz zsh-cd1cda9d57ff9f44d285bcd867721c4024500837.tar.xz zsh-cd1cda9d57ff9f44d285bcd867721c4024500837.zip | |
36725: vcs_info git: Compute %b correctly when rebasing detached heads.
This sets the %b expando to the hash of the before-the-merge HEAD, rather than to the literal string "detached HEAD". That hash is already available via the gen-applied-string hook.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 9a755434a..f45b414c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2015-09-30 Daniel Shahaf <d.s@daniel.shahaf.name> * 36725: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: + vcs_info git: Compute %b correctly when rebasing detached heads. + + * 36725: Functions/VCS_Info/Backends/VCS_INFO_get_data_git: vcs_info git: Compute %b correctly when merging to detached heads. |