| commit | e692317381b0c36e9605922c6d51f6e5ad2a4c42 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Jun 2013 18:00:08 +0000 (17 11:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 17 Jun 2013 18:00:08 +0000 (17 11:00 -0700) | ||
| tree | dcd17ed7c2ed4a640384cfefc6f4da17c3fbbc5f | treesnapshot (tar.gz zip) |
| parent | 48d5d4ea22a04dd778ff86140d09ea0ef7a73e87 | commitdiff |
| parent | 96e2b99ed56c8433cc4aa03f32d2ef2a22748fc0 | commitdiff |
Merge branch 'rr/rebase-autostash' into next
* 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()
* 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()