All of lore.kernel.org
 help / color / mirror / Atom feed
From: "fkater@googlemail.com" <fkater@googlemail.com>
To: git@vger.kernel.org
Subject: merge only some of the changed files?
Date: Fri, 19 Mar 2010 14:40:28 +0100	[thread overview]
Message-ID: <20100319134028.GA2318@comppasch2> (raw)

Hi all,

I am quite new to git.

If I want to merge branch B into A, however not all of the
changed files in B, how do I do that?

In other words: 'git diff --name-only A..B' lists 10 files
but I want to merge only 5 of them.

Thank You
 Felix

             reply	other threads:[~2010-03-19 13:41 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-19 13:40 fkater [this message]
2010-03-19 13:55 ` merge only some of the changed files? Michael J Gruber
2010-03-19 14:01 ` Thomas Rast

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100319134028.GA2318@comppasch2 \
    --to=fkater@googlemail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.