From: Caleb Cushing <xenoterracide@gmail.com>
To: Sitaram Chamarty <sitaramc@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: merge smart enough to adapt to renames?
Date: Thu, 19 Feb 2009 21:17:19 -0500 [thread overview]
Message-ID: <81bfc67a0902191817u11361d0bw1f2215a53e284f8f@mail.gmail.com> (raw)
In-Reply-To: <slrngprunn.hbo.sitaramc@sitaramc.homelinux.net>
> Not sure I understood this completely, but I've found it
> helps to make the rename/move as a separate commit, then
> start changing stuff. In other words, do too many things in
> the same commit, and you could lose this coolness.
well I the problem is.. in a sense I need to unmerge 2 files that I
once merged... they currently have the same name and are in the same
place, and where I merge them from they'll continue to have that name
(although they are different files with the same purpose) but I want
them to have different names and spots in my tree/repo.
--
Caleb Cushing
http://xenoterracide.blogspot.com
next prev parent reply other threads:[~2009-02-20 2:18 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-19 6:12 merge smart enough to adapt to renames? Caleb Cushing
2009-02-19 14:25 ` Sitaram Chamarty
2009-02-19 19:58 ` Caleb Cushing
2009-02-20 0:36 ` Sitaram Chamarty
2009-02-20 2:17 ` Caleb Cushing [this message]
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=81bfc67a0902191817u11361d0bw1f2215a53e284f8f@mail.gmail.com \
--to=xenoterracide@gmail.com \
--cc=git@vger.kernel.org \
--cc=sitaramc@gmail.com \
/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).