| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Mar 2010 08:35:59 +0000 (00:35 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Mar 2010 08:35:59 +0000 (00:35 -0800) |
* jc/grep-author-all-match-implicit:
"log --author=me --grep=it" should find intersection, not union
"log --author=me --grep=it" should find intersection, not union
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-grep.c | patch | | diff1 | | diff2 | | blob | history |
| builtin-rev-list.c | patch | | diff1 | | diff2 | | blob | history |
| grep.c | patch | | diff1 | | diff2 | | blob | history |
| grep.h | patch | | diff1 | | diff2 | | blob | history |
| revision.c | patch | | diff1 | | diff2 | | blob | history |
| t/t7002-grep.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-grep.c
Simple merge
diff --cc builtin-rev-list.c
Simple merge
diff --cc grep.c
Simple merge
diff --cc grep.h
Simple merge
diff --cc revision.c
Simple merge
diff --cc t/t7002-grep.sh
Simple merge