about summary refs log tree commit diff
path: root/Scripts
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-09-30 14:21:59 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2015-09-30 21:43:37 +0000
commit7ac34a3055d87b88d8b1b28ddfe68982f6550a08 (patch)
tree94c2d4e668f00338632cea53e7eb8b3fb4255504 /Scripts
parent756526eef3e064c3ffb023ae5e5e6df42e6e9162 (diff)
downloadzsh-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 'Scripts')
0 files changed, 0 insertions, 0 deletions