diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:04 -0700 |
| commit | 71e120202fe073bd2e4e9db59ca01ab7c5e72f7e (patch) | |
| tree | 8dcaab1bda2b12f2225b4f2b59b6c21a7ad42555 /diffcore-pickaxe.c | |
| parent | Merge branch 'cr/git-work-tree-sans-git-dir' (diff) | |
| parent | diffcore-pickaxe doc: document -S and -G properly (diff) | |
| download | git-71e120202fe073bd2e4e9db59ca01ab7c5e72f7e.tar.gz git-71e120202fe073bd2e4e9db59ca01ab7c5e72f7e.zip | |
Merge branch 'rr/diffcore-pickaxe-doc'
Update the low-level diffcore documentation on -S/-G and --pickaxe-all.
* rr/diffcore-pickaxe-doc:
diffcore-pickaxe doc: document -S and -G properly
diffcore-pickaxe: make error messages more consistent
Diffstat (limited to 'diffcore-pickaxe.c')
| -rw-r--r-- | diffcore-pickaxe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 63722f86dc..c97ac9b463 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -122,7 +122,7 @@ static void diffcore_pickaxe_grep(struct diff_options *o) char errbuf[1024]; regerror(err, ®ex, errbuf, 1024); regfree(®ex); - die("invalid log-grep regex: %s", errbuf); + die("invalid regex: %s", errbuf); } pickaxe(&diff_queued_diff, o, ®ex, NULL, diff_grep); @@ -246,7 +246,7 @@ static void diffcore_pickaxe_count(struct diff_options *o) char errbuf[1024]; regerror(err, ®ex, errbuf, 1024); regfree(®ex); - die("invalid pickaxe regex: %s", errbuf); + die("invalid regex: %s", errbuf); } regexp = ®ex; } else { |