From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jul 2013 22:41:17 +0000 (-0700)
Subject: Merge branch 'rr/diffcore-pickaxe-doc' into maint
X-Git-Tag: v1.8.3.3~9
X-Git-Url: https://repo.or.cz/w/alt-git.git/commitdiff_plain/4efd16543fe1c0871742dbd33d6adc2acfd11c3c

Merge branch 'rr/diffcore-pickaxe-doc' into maint

* rr/diffcore-pickaxe-doc:
  diffcore-pickaxe doc: document -S and -G properly
  diffcore-pickaxe: make error messages more consistent
---

4efd16543fe1c0871742dbd33d6adc2acfd11c3c