Merge branch 'maint'

* maint:
Documentation/gitdiffcore: fix order in pickaxe description
Documentation: fix minor inconsistency
Documentation: rebase -i ignores options passed to "git am"
hash_object: correction for zero length file

diff --cc Documentation/config.txt
Simple merge

diff --cc sha1_file.c
Simple merge