diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-07 08:25:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-07 08:25:55 -0700 |
| commit | bc44e9dc1bfb1c86b3b4d6392d496432a837fcaa (patch) | |
| tree | 5e8b9478d57175cf6ca5bffb547a1be79f722634 /commit.c | |
| parent | Merge branch 'jt/archive-zip-deflate-fix' into next (diff) | |
| parent | rebase -i: permit 'drop' of a merge commit (diff) | |
| download | git-bc44e9dc1bfb1c86b3b4d6392d496432a837fcaa.tar.gz git-bc44e9dc1bfb1c86b3b4d6392d496432a837fcaa.zip | |
Merge branch 'js/rebase-i-allow-drop-on-a-merge' into next
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 'commit.c')
0 files changed, 0 insertions, 0 deletions