diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:09 -0700 |
| commit | 662384c4996c7bc46322dc6d4f5afafa6e069d40 (patch) | |
| tree | cbfe2cdf9be3ae526c708bd5b3437f9808208849 /git-mergetool--lib.sh | |
| parent | Merge branch 'js/no-cherry-pick-head-after-punted' (diff) | |
| parent | pickaxe: factor out pickaxe (diff) | |
| download | tgif-662384c4996c7bc46322dc6d4f5afafa6e069d40.tar.xz | |
Merge branch 'rs/pickaxe'
* rs/pickaxe:
pickaxe: factor out pickaxe
pickaxe: give diff_grep the same signature as has_changes
pickaxe: pass diff_options to contains and has_changes
pickaxe: factor out has_changes
pickaxe: plug regex/kws leak
pickaxe: plug regex leak
pickaxe: plug diff filespec leak with empty needle
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions