diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-20 08:55:00 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-20 08:55:00 +0900 |
| commit | 36a255acd14779ef21747b56341796e18c229976 (patch) | |
| tree | d7b0215e9e11a7c6a0f928be492f47a27bce1356 /git-merge-resolve.sh | |
| parent | Merge branch 'ew/sha256-clone-remote-curl-fix' (diff) | |
| parent | ref-filter: fix read invalid union member bug (diff) | |
| download | tgif-36a255acd14779ef21747b56341796e18c229976.tar.xz | |
Merge branch 'zh/ref-filter-push-remote-fix'
The handling of "%(push)" formatting element of "for-each-ref" and
friends was broken when the same codepath started handling
"%(push:<what>)", which has been corrected.
* zh/ref-filter-push-remote-fix:
ref-filter: fix read invalid union member bug
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions