"Nicolas Richard" <[email protected]> writes: >> I'd be fine with merging simplify-TeX-parse-error into master (or >> just applying the diff onto master so that the merge commits don't >> make it into master's history) now, and then fix bugs there as they >> are encountered. > > See the --squash option to git merge.
Yes, I know. The question is more like that: I have a branch with some changes which I want to have published for others to test. And I want to incorporate changes from master. What I did was just "git merge master" in my branch and then push it. That of course caused many merge commits. Would it also have been possible to "git rebase master" in my branch and then push it? I think that wouldn't work because the HEAD commit (which actually contains my changes) would get a different parent with every rebase. Thus history is modified and I couldn't push my branch except with --force which would invalidate the branches people have based on my one. Is that correct or am I missing something? Bye, Tassilo _______________________________________________ auctex-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/auctex-devel
