diff options
author | Junio C Hamano <junkio@cox.net> | 2006-05-02 16:15:29 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-05-02 16:15:29 -0700 |
commit | fc71b89fb61fd2ca98dad481cc44671e7680f9ce (patch) | |
tree | a1c836b0f358a1fc8563b6722bdd043887532ba6 /git-am.sh | |
parent | Merge branch 'js/remoteconfig' into next (diff) | |
parent | builtin-grep: support -w (--word-regexp). (diff) | |
download | tgif-fc71b89fb61fd2ca98dad481cc44671e7680f9ce.tar.xz |
Merge branch 'jc/grep' into next
* jc/grep:
builtin-grep: support -w (--word-regexp).
builtin-grep: support -c (--count).
builtin-grep: allow more than one patterns.
builtin-grep: allow -<n> and -[ABC]<n> notation for context lines.
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions