Tassilo Horn <[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. >From the manual : > Produce the working tree and index state as if a real merge happened > (except for the merge information), but do not actually make a commit, > move the HEAD, or record $GIT_DIR/MERGE_HEAD (to cause the next git > commit command to create a merge commit). This allows you to create a > single commit on top of the current branch whose effect is the same as > merging another branch (or more in case of an octopus). Best wishes, -- Nicolas Richard _______________________________________________ auctex-devel mailing list [email protected] https://lists.gnu.org/mailman/listinfo/auctex-devel
