From: Phil Susi <psusi@ubuntu.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Merge after rename
Date: Thu, 09 Jul 2015 16:44:35 -0400 [thread overview]
Message-ID: <559EDD33.50906@ubuntu.com> (raw)
I'm trying to cherry pick an old change from an old branch onto the
current master, and since the old change, the directory structure was
altered and the modified files were moved. Instead of detecting the new
location of the file and applying the changes to it, git is re-adding
the old file at the old location in its entirety. How can I get it to
correctly notice the rename and merge the changes in at the file's new
location?
next reply other threads:[~2015-07-09 20:48 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 20:44 Phil Susi [this message]
2015-07-10 3:52 ` Merge after rename Jacob Keller
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=559EDD33.50906@ubuntu.com \
--to=psusi@ubuntu.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).