![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Jul 2009 07:59:58 +0000 (00:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 9 Jul 2009 07:59:58 +0000 (00:59 -0700) | ||
| commit | 128a9d86da3c156c7d1bf25692eeb68a522af935 | |
| tree | c741913f11f81167c34ab306c35c8ed95eb88640 | tree | snapshot |
| parent | ce4f404c6f059abb4988f4549c6e46a3ba0d56ec | commit | diff |
| parent | ed24e401e0e6ab860475b8575e28a2c6ea99cc69 | commit | diff |
Merge branch 'rs/grep-p'
* rs/grep-p:
grep: simplify -p output
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: simplify -p output
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 | | blob | history |
| diff.c | diff1 | | diff2 | | blob | history |