diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-09-20 11:16:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-09-20 11:16:30 -0700 |
| commit | 2b800ec45e53051c41a85900009430704bfdf031 (patch) | |
| tree | 9de52f5abeced8315ad4f5d70e15ddb325b037da /commit.c | |
| parent | 6531f31ef3bead57a3255fa08efa6e7553c5a9a7 (diff) | |
| parent | bf6ab087d14b839f8a7b188a7af62e43164873fb (diff) | |
Merge branch 'pw/rebase-autostash-fix'
"git rebase --autostash" failed to resurrect the autostashed
changes when the command gets aborted after giving back control
asking for hlep in conflict resolution.
* pw/rebase-autostash-fix:
rebase: apply and cleanup autostash when rebase fails to start
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions