| commit | c6b5ae093a8394773a1719f32cefb7f009005608 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Jul 2009 02:46:59 +0000 (1 19:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 2 Jul 2009 02:46:59 +0000 (1 19:46 -0700) | ||
| tree | 8b111bfb44b35a1eb0373e786a870a633becbbdc | treesnapshot (tar.gz zip) |
| parent | 2d15aac85459f45b80128bb1cf7419da4650676a | commitdiff |
| parent | 60ecac98ed6f420c6bf823491074219087c749d4 | commitdiff |
Merge branch 'rs/grep-p' into next
* rs/grep-p:
grep -p: support user defined regular expressions
grep: add option -p/--show-function
grep: handle pre context lines on demand
grep: print context hunk marks between files
grep: move context hunk mark handling into show_line()
userdiff: add xdiff_clear_find_func()
* rs/grep-p:
grep -p: support user defined regular expressions
grep: add option -p/--show-function
grep: handle pre context lines on demand
grep: print context hunk marks between files
grep: move context hunk mark handling into show_line()
userdiff: add xdiff_clear_find_func()
| builtin-grep.c | diff1 | diff2 | blobhistory |
| diff.c | diff1 | diff2 | blobhistory |