Merge branch 'rr/rebase-autostash'
commitafaa2a479d4994b0e98847f95754f8c3536a662a
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:07 +0000 (23 14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:08 +0000 (23 14:53 -0700)
tree706c9c71ba3968db33e8931f481513ae305c9d36
parent352e86e5431509b6834b6d22d139356b6ba6e1b9
parent96e2b99ed56c8433cc4aa03f32d2ef2a22748fc0
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()