diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:46:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-21 13:46:57 -0700 |
| commit | 1fe6955fd4e0de21a5581376589c8df56fae6adf (patch) | |
| tree | 23a6df77791993ec24d8fda0aa7bf21ebd0f4d96 /builtin/update-ref.c | |
| parent | Git 2.51 (diff) | |
| parent | rebase -i: permit 'drop' of a merge commit (diff) | |
| download | git-1fe6955fd4e0de21a5581376589c8df56fae6adf.tar.gz git-1fe6955fd4e0de21a5581376589c8df56fae6adf.zip | |
Merge branch 'js/rebase-i-allow-drop-on-a-merge'
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 'builtin/update-ref.c')
0 files changed, 0 insertions, 0 deletions