summaryrefslogtreecommitdiff
path: root/t/t7201-co.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:04 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-20 11:01:04 -0700
commitd15c05a5d016bfd637fa1966951ae0686d17272e (patch)
tree684b70ac3e0abc8fe10b273f69440ddd5d74e581 /t/t7201-co.sh
parentMerge branch 'jk/rev-list-count-with-bitmap' (diff)
parentxdiff: fix merging of appended hunk with -W (diff)
downloadtgif-d15c05a5d016bfd637fa1966951ae0686d17272e.tar.xz
Merge branch 'rs/xdiff-hunk-with-func-line'
"git show -W" (extend hunks to cover the entire function, delimited by lines that match the "funcname" pattern) used to show the entire file when a change added an entire function at the end of the file, which has been fixed. * rs/xdiff-hunk-with-func-line: xdiff: fix merging of appended hunk with -W grep: -W: don't extend context to trailing empty lines t7810: add test for grep -W and trailing empty context lines xdiff: don't trim common tail with -W xdiff: -W: don't include common trailing empty lines in context xdiff: ignore empty lines before added functions with -W xdiff: handle appended chunks better with -W xdiff: factor out match_func_rec() t4051: rewrite, add more tests
Diffstat (limited to 't/t7201-co.sh')
0 files changed, 0 insertions, 0 deletions