From: Caleb Cushing <xenoterracide@gmail.com>
To: git@vger.kernel.org
Subject: merge smart enough to adapt to renames?
Date: Thu, 19 Feb 2009 01:12:58 -0500 [thread overview]
Message-ID: <81bfc67a0902182212h578e677ck6029c56cb86f7bce@mail.gmail.com> (raw)
branch gentoo.org has a file profiles/package.mask
the software that uses this supports having this be a directory as well.
I'm thinking of mv-ing this file in branch regen2.org to
profiles/package.mask/gentoo.org
since I can't change the location in gentoo.org (for mostly
non-technical reasons) when I run git merge gentoo.org from regen2.org
will git be smart enough to try to merge an updated
profiles/package.mask into profiles/package.mask/gentoo.org in the
future?
--
Caleb Cushing
http://xenoterracide.blogspot.com
next reply other threads:[~2009-02-19 6:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-19 6:12 Caleb Cushing [this message]
2009-02-19 14:25 ` merge smart enough to adapt to renames? Sitaram Chamarty
2009-02-19 19:58 ` Caleb Cushing
2009-02-20 0:36 ` Sitaram Chamarty
2009-02-20 2:17 ` Caleb Cushing
2009-02-20 7:24 ` Rogan Dawes
2009-02-21 4:48 ` Kris Shannon
2009-02-21 11:12 ` Rogan Dawes
2009-02-22 1:00 ` Caleb Cushing
2009-02-22 17:13 ` Rogan Dawes
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=81bfc67a0902182212h578e677ck6029c56cb86f7bce@mail.gmail.com \
--to=xenoterracide@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).