diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-03-26 17:11:20 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-03-26 17:11:20 -0700 |
commit | 4e4baee3f44da26a5eaab27c76d597b04fef5259 (patch) | |
tree | 5d0ebb218dddd9fc17531ac75d140bf59eb056da /t/t3310-notes-merge-manual-resolve.sh | |
parent | Merge branch 'hi/gpg-prefer-check-signature' (diff) | |
parent | t0021: test filter metadata for additional cases (diff) | |
download | tgif-4e4baee3f44da26a5eaab27c76d597b04fef5259.tar.xz |
Merge branch 'bc/filter-process'
Provide more information (e.g. the object of the tree-ish in which
the blob being converted appears, in addition to its path, which
has already been given) to smudge/clean conversion filters.
* bc/filter-process:
t0021: test filter metadata for additional cases
builtin/reset: compute checkout metadata for reset
builtin/rebase: compute checkout metadata for rebases
builtin/clone: compute checkout metadata for clones
builtin/checkout: compute checkout metadata for checkouts
convert: provide additional metadata to filters
convert: permit passing additional metadata to filter processes
builtin/checkout: pass branch info down to checkout_worktree
Diffstat (limited to 't/t3310-notes-merge-manual-resolve.sh')
0 files changed, 0 insertions, 0 deletions