Merge branch 'rr/rebase-autostash'
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:28 +0000 (13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:29 +0000 (13:31 -0700)
commit45acb7592825b1faa59ea09247bb88b8e91849e3
tree4a3b906ea88591e7c12a3ed8624f8a8ea88a6def
parent52faa0e8c80ec8351f735c32d858b167d63a0642
parent587947750bd73544a6a99811f0ddfd64e1ff1445
Merge branch 'rr/rebase-autostash'

* rr/rebase-autostash:
  rebase: implement --[no-]autostash and rebase.autostash
  rebase --merge: return control to caller, for housekeeping
  rebase -i: return control to caller, for housekeeping
  am: return control to caller, for housekeeping
  rebase: prepare to do generic housekeeping
  rebase -i: don't error out if $state_dir already exists
  am: tighten a conditional that checks for $dotest