From: "Fabian Kössel" <mok4sin@googlemail.com>
To: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFD] Deepen the git directory structure a bit.
Date: Thu, 25 Feb 2010 11:58:52 +0100 [thread overview]
Message-ID: <4B8657EC.8060302@googlemail.com> (raw)
In-Reply-To: <7v7hq46gwe.fsf@alter.siamese.dyndns.org>
On 22.02.2010 23:32, Junio C Hamano wrote:
> I'll queue with a trivial addition of "rm builtin/*.o" to the "make
clean"
> target. I am not looking forward to merging the result of this with
other
> topics, though... X-<.
Just out of curiosity, how do you actually merge such a relatively big
rename with other branches?
I haven't found a pleasant way yet to merge rename+modification in one
branch and modification on an old path in another branch.
There is git file-merge theirs base ours . But it only seems to take
filenames and no git object specifications. It would be very handy if
something like
git file-merge bfile HEAD^:afile afile
would be possible.
For clearification, here an example
echo "First line" > afile
git add .
git commit -m "First commit in master"
git checkout -b mybranch
echo "Second line in mybranch" >> afile
git mv afile bfile
git commit -a -m "Change and rename in mybranch"
git checkout master
echo "Changed first line in master" > afile
git commit -a -m "changed afile"
git merge mybranch
Regards
Fabian
next prev parent reply other threads:[~2010-02-25 10:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-18 18:36 [RFD] Deepen the git directory structure a bit Linus Torvalds
2010-02-18 20:24 ` Junio C Hamano
2010-02-18 21:50 ` Avery Pennarun
2010-02-18 22:20 ` Linus Torvalds
2010-02-18 22:18 ` Linus Torvalds
2010-02-18 23:34 ` Christian MICHON
2010-02-19 3:50 ` Pavan Kumar Sunkara
2010-02-22 16:42 ` Linus Torvalds
2010-02-22 22:32 ` Junio C Hamano
2010-02-25 10:58 ` Fabian Kössel [this message]
2010-02-27 1:28 ` Junio C Hamano
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=4B8657EC.8060302@googlemail.com \
--to=mok4sin@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).