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

1  2 
Documentation/diff-options.txt

Simple merge