git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Merging one file only

From
Michael Witten <mfwitten@gmail.com>
Date
Aug 21, 2011, 21:32 UTC
Message-ID
<CAMOZ1BvY13ynmtCkhFNU9Dc8PqwVQUrp8ham5zHrdq2vbMY5JQ@mail.gmail.com>
In-Reply-To
<1313958819073-6709333.post@n2.nabble.com>
On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@maieul.net> wrote:
Show 9 quoted lines
> Hello,
>
> my problem is :
> - I have 2 branches : "master" and "sty"
> - In the branch sty, I have commit that i don't want to merge on the branch
> master. The only file that I want merge are the *dtx files.
>
> My question is : how can i do to merge *dtx files from "sty" to "master",
> and have log of commit on the *dtx ? Is it possible ?
There are a number of ways to do this, some more general than others.

Do you know all of the names of the files for which you don't want associated commits? Do the files that you don't want get changed in some of the commits that you do want?

Previous: MaïeulNext: Maïeul Rouquette
Message 2 of 4 in “Merging one file only”
  1. MaïeulAug 21, 2011
  2. Michael WittenAug 21, 2011
  3. Maïeul RouquetteAug 21, 2011
  4. PJ WeisbergAug 21, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.