Andrew's git / gitweb.git / diff
?
Merge branch 'rr/rebase-autostash'
authorJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:07 +0000 (14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 23 Jun 2013 21:53:08 +0000 (14:53 -0700)
* 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()

Trivial merge