diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-15 10:29:27 -0700 |
| commit | d549c188be4f041a117d3ca942a5ac1e5f9fc704 (patch) | |
| tree | a1541dc6dd58f29fee40fd2bded9212d935b4090 /refs/files-backend.c | |
| parent | 8c3d7c5f1104e1d1935f91f5852c82df0c5b0ada (diff) | |
| parent | 4d491ade8f6597904a7b79ff5d34f8524f915ac2 (diff) | |
Merge branch 'js/rebase-i-allow-drop-on-a-merge' into maint-2.51
During interactive rebase, using 'drop' on a merge commit lead to
an error, which was incorrect.
* js/rebase-i-allow-drop-on-a-merge:
rebase -i: permit 'drop' of a merge commit
Diffstat (limited to 'refs/files-backend.c')
0 files changed, 0 insertions, 0 deletions