Am 07.02.2015 um 22:32 schrieb Sebastian Schuberth: > On 06.02.2015 22:28, Sergey Organov wrote: > >> # Now rebase my work. >> git rebase -f HEAD~1 >> >> # What? Where is my "Precious" change in "a"??? >> cat a >> </SCRIPT> >> >> I.e., the modification marked [!] was silently lost during rebase! > > Just a wild guess: Maybe because you omitted "-p" / "--preserve-merges" > from "git rebase"?
No, that would not help. --preserve-merges repeats the merge, but does not apply the amendment. It's just how rebase works: It omits merge commits when it linearizes history. Sergey, it is impossible for git rebase to decide to which rebased commit the amendement applies. It doesn't even try to guess. It's the responsibility of the user to apply the amendment to the correct commit. -- Hannes -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
