diff options
author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2020-03-26 02:43:41 +0000 |
---|---|---|
committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2020-03-27 01:14:42 +0000 |
commit | d13d6afb2e788fac8eefeff47e889a54498eea9a (patch) | |
tree | 9aca14e4ec17b79e577c4b87d0d4f3521011ba7d /Functions/Prompts/prompt_bigfade_setup | |
parent | f207fb90d8a86c5968e1a3d702ea4cf778bd79d8 (diff) | |
download | zsh-d13d6afb2e788fac8eefeff47e889a54498eea9a.tar.gz zsh-d13d6afb2e788fac8eefeff47e889a54498eea9a.tar.xz zsh-d13d6afb2e788fac8eefeff47e889a54498eea9a.zip |
45627: vcs_info git: Under git-am(1) conflicts, pass to the gen-applied-string hook information on already-applied patches.
The hook already receives information about the current (topmost applied) patch and, if the get-unapplied style is set, about future (unapplied) patches. Tested in the Functions/VCS_Info/test-repo-git-rebase-apply scenario, after manually converting the rebase to a «git am». (Specifically, I ran: mkdir d git rebase --abort git format-patch rebase_from_this..HEAD -o d git checkout rebase_onto_this git am d/* .)
Diffstat (limited to 'Functions/Prompts/prompt_bigfade_setup')
0 files changed, 0 insertions, 0 deletions