Merge branch 'rr/diffcore-pickaxe-doc' into maint
commit4efd16543fe1c0871742dbd33d6adc2acfd11c3c
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:41:17 +0000 (3 15:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Jul 2013 22:41:17 +0000 (3 15:41 -0700)
tree322061af94a0b48657d617e47c3b2705381dac31
parent213d25648ae926d523727f1df06ad7ee4d4ad916
parent5bc3f0b56779d189aaf7cab7e5d307aa4e7c0887
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
Documentation/diff-options.txt