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 | 7ac34a3055d87b88d8b1b28ddfe68982f6550a08 (patch) | |
| tree | 94c2d4e668f00338632cea53e7eb8b3fb4255504 /ChangeLog | |
| parent | 756526eef3e064c3ffb023ae5e5e6df42e6e9162 (diff) | |
| download | zsh-7ac34a3055d87b88d8b1b28ddfe68982f6550a08.tar.gz zsh-7ac34a3055d87b88d8b1b28ddfe68982f6550a08.tar.xz zsh-7ac34a3055d87b88d8b1b28ddfe68982f6550a08.zip | |
36725: vcs_info git: Compute %b correctly when merging to detached heads.
The %b expando should be the hash prior to the merge. The hash of the merge result is available as the %i expando and via the gen-applied-string hook.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 498ad7c87..9a755434a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +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 merging to detached + heads. + 2015-09-30 Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp> * 36697: Completion/Base/Utility/_arguments: handle options |