Merge branch 'rr/diffcore-pickaxe-doc'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:04 +0000 (13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:04 +0000 (13:31 -0700)
commit71e120202fe073bd2e4e9db59ca01ab7c5e72f7e
tree8dcaab1bda2b12f2225b4f2b59b6c21a7ad42555
parentb1bd929611c729ace6e38a41b01b365469312327
parent5bc3f0b56779d189aaf7cab7e5d307aa4e7c0887
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
Documentation/diff-options.txt