From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 23 Jun 2013 21:53:07 +0000 (-0700)
Subject: Merge branch 'rr/rebase-autostash'
X-Git-Tag: v1.8.4-rc0~149
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/afaa2a479d4994b0e98847f95754f8c3536a662a

Merge branch 'rr/rebase-autostash'

* rr/rebase-autostash:
rebase: finish_rebase() in noop rebase
rebase: finish_rebase() in fast-forward rebase
rebase: guard against missing files in read_basic_state()
---

afaa2a479d4994b0e98847f95754f8c3536a662a