[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level
From: |
Nicolas Richard |
Subject: |
Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level |
Date: |
Wed, 03 Dec 2014 12:29:52 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) |
Tassilo Horn <address@hidden> 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
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Mosè Giordano, 2014/12/02
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Tassilo Horn, 2014/12/03
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level,
Nicolas Richard <=
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Tassilo Horn, 2014/12/03
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Davide G. M. Salvetti, 2014/12/03
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Tassilo Horn, 2014/12/04
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Davide G. M. Salvetti, 2014/12/07
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Tassilo Horn, 2014/12/08
- Re: [AUCTeX-devel] [PATCH v3]: Merge /preview/ into top-level, Nicolas Richard, 2014/12/03