Merge branch 'hv/autosquash-config'

* hv/autosquash-config:
  add configuration variable for --autosquash option of interactive rebase

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-rebase.txt
Simple merge

diff --cc git-rebase--interactive.sh
Simple merge