From: Junio C Hamano <gitster@pobox.com>
To: David Soria Parra <sn_@gmx.net>
Cc: Sean <seanlkml@sympatico.ca>, git@vger.kernel.org
Subject: Re: how to use git merge -s subtree?
Date: Sat, 05 Jan 2008 18:42:37 -0800 [thread overview]
Message-ID: <7vir277jz6.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <47803CB6.4050102@gmx.net> (David Soria Parra's message of "Sun, 06 Jan 2008 03:28:06 +0100")
David Soria Parra <sn_@gmx.net> writes:
> Well yes the history is preserved, but it's not connected to the
> subdirectory. So you cannot do git-log B/foo.c as git doesnot know where
> to search it as it thinks
> it is in /foo.c not in B/foo.c
The thing is, what you are talking is not about the subtree
merge strategy, but the fundamental philosophy of git. Asking
for "the history of file B/foo.c" does not make any sense, as
git never tracks history of individual files.
I'll point you to one of the most important messages in the
whole archive of the git mailing list.
http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217
next prev parent reply other threads:[~2008-01-06 2:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-05 23:00 how to use git merge -s subtree? Miklos Vajna
2008-01-06 1:17 ` Sean
2008-01-06 1:22 ` David Soria Parra
2008-01-06 2:13 ` Sean
2008-01-06 2:28 ` David Soria Parra
2008-01-06 2:42 ` Junio C Hamano [this message]
2008-01-06 8:06 ` Sean
2008-01-07 21:04 ` Junio C Hamano
2008-01-08 5:34 ` Sean
2008-01-08 6:57 ` Junio C Hamano
2008-01-06 3:45 ` Miklos Vajna
2008-01-06 1:20 ` David Soria Parra
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=7vir277jz6.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=seanlkml@sympatico.ca \
--cc=sn_@gmx.net \
/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).