Don't panic. This is only a test. I created the rebase-test branch as follows:
git checkout -b rebase-test git push origin rebase-test git rebase *master* --strategy-option=*theirs* The last line took almost 10 minutes. In this branch, gitk show all work since July 6 (the last commit to master) in a flat, linear, list of commits. Note that "theirs" has a reversed meaning from merges. I am tempted to flatten devel this way! Yes, I am aware that the conventional wisdom is that one must never rewrite history in pushed commits. Otoh, what good is history if it's a spaghetti bowl? Don't panic. For now, flattening devel seems too drastic and dangerous. Instead, I plan to use rebase instead of merge in future work. What do you think? Your comments, please. Edward -- You received this message because you are subscribed to the Google Groups "leo-editor" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/leo-editor/4dce8ae3-8a20-4efe-9289-45407aaadb2c%40googlegroups.com.
