| commit | 16f7c54c2c78d5501a3c71a3b1bb521bda7d928d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 Jun 2013 22:27:42 +0000 (4 15:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 Jun 2013 22:27:42 +0000 (4 15:27 -0700) | ||
| tree | 8fee4e13bc1e796559019ab0c0ff86ae0475ce46 | treesnapshot (tar.gz zip) |
| parent | f334a2ad151406a6a0e6c0ebd1755150f38fc71d | commitdiff |
| parent | 587947750bd73544a6a99811f0ddfd64e1ff1445 | commitdiff |
Merge branch 'rr/rebase-autostash' into next
* 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
* 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