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"?
--
Sebastian Schuberth
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
