I found the following erroneous behavior with "git rebase -p". My current version is git version 2.16.2.windows.1 I made an example at GitHub, https://github.com/jkstrauss/git-bug/ There seem to be two problems when rebasing merge commits with git rebase -p : 1. All lines of merge commits' messages get collapse into a single line. 2. When an asterisk is present in the middle of the line it gets replaced with the file names of the current directory. Joseph Kalman Strauss Lifecycle Management Engineer B&H Photo 212-239-7500 x2212 josephst@xxxxxxxxxxx