Merge branch 'hv/autosquash-config' into next
commit03a8eecb2ddac5dedcfdacdedd79b2584a0725e6
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:07:54 +0000 (18 14:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Aug 2010 21:07:54 +0000 (18 14:07 -0700)
treec6d9654eae4b74775cb63fffea291b5a88323297
parent9fdaf2746711b9a2b2dd56d36c97a3182a63053b
parentdd1e5b313a0aef5d22cd9909c14e4b1b6dcbea79
Merge branch 'hv/autosquash-config' into next

* hv/autosquash-config:
  add configuration variable for --autosquash option of interactive rebase
Documentation/config.txt
Documentation/git-rebase.txt
git-rebase--interactive.sh