diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:17 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:17 +0900 |
| commit | a70f725c06bb28c1f79c8e30ea9cdb30c45383d0 (patch) | |
| tree | 3ddc3444f789c5202c449daebdc9406b5cece36e /contrib/persistent-https/socket.go | |
| parent | d97034b0a15c683d7104d2189322ea75c730b46c (diff) | |
| parent | 203573b024610d7e50cc83a6d06867880ed8cc4f (diff) | |
| download | git-a70f725c06bb28c1f79c8e30ea9cdb30c45383d0.tar.gz git-a70f725c06bb28c1f79c8e30ea9cdb30c45383d0.zip | |
Merge branch 'pw/rebase-i-after-failure' into maint-2.42
Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
cf. <6b927687-cf6e-d73e-78fb-bd4f46736928@gmx.de>
* pw/rebase-i-after-failure:
rebase -i: fix adding failed command to the todo list
rebase --continue: refuse to commit after failed command
rebase: fix rewritten list for failed pick
sequencer: factor out part of pick_commits()
sequencer: use rebase_path_message()
rebase -i: remove patch file after conflict resolution
rebase -i: move unlink() calls
Diffstat (limited to 'contrib/persistent-https/socket.go')
0 files changed, 0 insertions, 0 deletions