From: Junio C Hamano <gitster@pobox.com>
To: Stephen & Linda Smith <ischis2@cox.net>
Cc: Git List <git@vger.kernel.org>, Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH V5 2/2] user-manual: add section documenting shallow clones
Date: Tue, 29 Dec 2015 15:39:59 -0800 [thread overview]
Message-ID: <xmqq8u4cg6y8.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqd1tog88a.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Tue, 29 Dec 2015 15:12:21 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> Thanks for working on this. Perhaps the last paragraph can be like
> this?
>
> Merging inside a <<def_shallow_clone,shallow clone>> will work
> as long as a merge base is found in the resent history.
> Otherwise, it will be like merging unrelated histories and may
> have to result in huge conflicts. This limitation may make such
> a repository unsuitable to be used in merge based workflows.
I forgot to say this, but "a" merge base above is very much
deliberate. There can be (and indeed are in real life projects)
multiple merge bases between two commits being merged, and an
automatic merge wouldn't "be like merging unrelated histories" as
long as one of them exists in the shallowed history.
next prev parent reply other threads:[~2015-12-29 23:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-22 2:09 [PATCH 1/2] Define the term shallow clone Stephen P. Smith
2015-12-22 2:09 ` [PATCH 2/2] Add a section to the users manual documenting shallow clones Stephen P. Smith
2015-12-22 3:47 ` Eric Sunshine
2015-12-22 18:40 ` [PATCH V2 2/2] user-manual: add section " Stephen P. Smith
2015-12-23 3:49 ` [PATCH V2 x/2] " Stephen & Linda Smith
2015-12-23 3:53 ` [PATCH V3 2/2] " Stephen P. Smith
2015-12-23 7:47 ` Eric Sunshine
2015-12-23 20:36 ` [PATCH V4 " Stephen P. Smith
2015-12-28 22:57 ` Junio C Hamano
2015-12-29 18:54 ` [PATCH V4 1/2] glossary: define the term shallow clone Stephen P. Smith
2015-12-29 18:54 ` [PATCH V5 2/2] user-manual: add section documenting shallow clones Stephen P. Smith
2015-12-29 19:24 ` Junio C Hamano
2015-12-29 21:47 ` Stephen & Linda Smith
2015-12-29 23:12 ` Junio C Hamano
2015-12-29 23:31 ` [PATCH V6 " Stephen P. Smith
2015-12-29 23:39 ` Junio C Hamano [this message]
2015-12-30 0:03 ` [PATCH V7 " Stephen P. Smith
2015-12-29 0:00 ` [PATCH V4 " Stephen & Linda Smith
2015-12-22 16:18 ` [PATCH 2/2] Add a section to the users manual " Stephen & Linda Smith
2015-12-22 3:12 ` [PATCH 1/2] Define the term shallow clone Eric Sunshine
2015-12-22 18:38 ` [PATCH V2 1/2] glossary: define " Stephen P. Smith
2015-12-23 3:53 ` [PATCH V3 " Stephen P. Smith
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8u4cg6y8.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=ischis2@cox.net \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).