David Kastrup <d...@gnu.org> writes: > I think adding --preserve-merges should help. The alternative is > --no-ff which refuses to do anything if master has separate commits.
P.S.: After thinking about it, I decided I don't want to try to fix this part of the history. If my playing around with dev/staging is any indication, I could do a non-fastforwarding fix (and only those can remove the disruptive commit) only by deleting and recreating master, given the current repository settings. I am not going to take the chance that any metadata in connection with master will get dropped by git when I delete master. In future, rebase using --preserve-merges, and sorry for not noticing this earlier. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
