From: "Marcin Wiśnicki" <mwisnicki@gmail.com>
To: git@vger.kernel.org
Subject: Merge after directory rename ?
Date: Sun, 21 Aug 2011 21:41:38 +0000 (UTC) [thread overview]
Message-ID: <j2ru2h$cd$1@dough.gmane.org> (raw)
Is it possible to merge files after performing directory renames in such
way that new files will end up in renamed directories ?
For example:
1. [master] add dir1/file1
2. [branch1] branch from master
3. [branch1] add dir1/file2
4. [master] rename dir1 to dir2
5. [master] merge branch1
Where it should notice that dir1=>dir2 and therefore {dir1=>dir2}/file2.
Currently I end up with dir1/file2 which is undesirable as it breaks
refactorings and requires a lot of manual effort to clean-up.
next reply other threads:[~2011-08-21 21:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-21 21:41 Marcin Wiśnicki [this message]
2011-08-21 23:45 ` Merge after directory rename ? Michael Witten
2011-08-21 23:53 ` Michael Witten
2011-08-22 0:32 ` Marcin Wiśnicki
2011-08-22 2:19 ` Michael Witten
2011-08-22 8:49 ` Marcin Wiśnicki
2011-08-23 14:50 ` Michael Witten
2011-08-23 19:13 ` Jeff King
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='j2ru2h$cd$1@dough.gmane.org' \
--to=mwisnicki@gmail.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).