From: Martin Waitz <tali@admingilde•org>
To: Alex Riesen <raa.lkml@gmail•com>
Cc: skimo@liacs•nl, Junio C Hamano <junkio@cox•net>, git@vger•kernel.org
Subject: Re: [RFC] Third round of support for cloning submodules
Date: Thu, 24 May 2007 17:56:16 +0200 [thread overview]
Message-ID: <20070524155616.GM5412@admingilde.org> (raw)
In-Reply-To: <20070522215423.GI30871@steel.home>
[-- Attachment #1: Type: text/plain, Size: 1058 bytes --]
hoi :)
On Tue, May 22, 2007 at 11:54:23PM +0200, Alex Riesen wrote:
> Martin Waitz, Mon, May 21, 2007 01:12:01 +0200:
> > On Mon, May 21, 2007 at 01:02:48AM +0200, Alex Riesen wrote:
> > > > If the user did commit and then you do a supermodule checkout -m you
> > > > will get a merge.
> > >
> > > Only if the user continue to use the last branch (or the detached
> > > head) the subproject was on. He don't have to, he can even return to
> > > the commit which does not conflict, unless he have to complicate
> > > things.
> >
> > just curious:
> > so you want to differenciate between a subproject HEAD which was
> > set by the superproject and other ones?
>
> No. Why do you think that I want to do that?
I think I simply was too tired to read. ;-)
Your 'Only if the user continues to use...' suggested that he has a
different option, namely going to a branch which is not controlled
by the superproject.
And of course the user can go back to another commit, after checkout -m
created a merge... ;-)
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-05-24 15:56 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-20 18:04 [RFC] Third round of support for cloning submodules skimo
2007-05-20 18:04 ` [PATCH 01/15] Add dump-config skimo
2007-05-20 18:04 ` [PATCH 02/15] git-config: add --remote option for reading config from remote repo skimo
2007-05-20 18:11 ` Frank Lichtenheld
2007-05-20 19:44 ` Sven Verdoolaege
2007-05-20 22:03 ` Frank Lichtenheld
2007-05-20 18:04 ` [PATCH 03/15] http.h: make fill_active_slots a function pointer skimo
2007-05-20 18:04 ` [PATCH 04/15] git-config: read remote config files over HTTP skimo
2007-05-20 18:04 ` [PATCH 05/15] unpack-trees.c: pass cache_entry * to verify_absent rather than just the name skimo
2007-05-20 18:04 ` [PATCH 06/15] git-read-tree: take --submodules option skimo
2007-05-20 21:24 ` Martin Waitz
2007-05-20 21:50 ` Sven Verdoolaege
2007-05-20 18:04 ` [PATCH 07/15] unpack-trees.c: assume submodules are clean skimo
2007-05-20 18:04 ` [PATCH 08/15] Add run_command_v_opt_cd: chdir into a directory before exec skimo
2007-05-20 18:04 ` [PATCH 09/15] entry.c: optionally checkout submodules skimo
2007-05-20 21:18 ` Martin Waitz
2007-05-20 21:51 ` Sven Verdoolaege
2007-05-24 13:29 ` Sven Verdoolaege
2007-05-20 18:04 ` [PATCH 10/15] git-checkout: pass --submodules option to git-read-tree skimo
2007-05-20 18:04 ` [PATCH 11/15] git-read-tree: treat null commit as empty tree skimo
2007-05-20 18:04 ` [PATCH 12/15] git_config: add void * for callback data skimo
2007-05-20 18:04 ` [PATCH 13/15] unpack-trees.c: optionally clone submodules for later checkout skimo
2007-05-20 18:04 ` [PATCH 14/15] entry.c: optionall checkout newly cloned submodules skimo
2007-05-20 18:04 ` [PATCH 15/15] git-clone: add --submodules for cloning submodules skimo
2007-05-20 19:10 ` [RFC] Third round of support " Junio C Hamano
2007-05-20 19:59 ` Sven Verdoolaege
2007-05-20 20:54 ` Alex Riesen
2007-05-20 21:09 ` Sven Verdoolaege
2007-05-20 21:24 ` Alex Riesen
2007-05-20 21:47 ` Sven Verdoolaege
2007-05-20 22:26 ` Alex Riesen
2007-05-21 9:57 ` Sven Verdoolaege
2007-05-21 10:44 ` Josef Weidendorfer
2007-05-21 11:41 ` Martin Waitz
2007-05-20 21:40 ` Martin Waitz
2007-05-20 22:24 ` Alex Riesen
2007-05-20 22:55 ` Martin Waitz
2007-05-20 23:02 ` Alex Riesen
2007-05-20 23:12 ` Martin Waitz
2007-05-22 21:54 ` Alex Riesen
2007-05-24 15:56 ` Martin Waitz [this message]
2007-05-21 0:39 ` Steven Grimm
2007-05-21 10:01 ` Sven Verdoolaege
2007-05-22 21:56 ` Alex Riesen
2007-05-20 22:14 ` Martin Waitz
2007-05-20 22:58 ` Alex Riesen
2007-05-20 23:36 ` Martin Waitz
2007-05-20 22:52 ` Martin Waitz
2007-05-21 8:54 ` Sven Verdoolaege
2007-05-21 10:07 ` Martin Waitz
2007-05-21 10:14 ` Sven Verdoolaege
2007-05-21 11:34 ` Martin Waitz
2007-05-21 12:19 ` Sven Verdoolaege
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=20070524155616.GM5412@admingilde.org \
--to=tali@admingilde$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=junkio@cox$(echo .)net \
--cc=raa.lkml@gmail$(echo .)com \
--cc=skimo@liacs$(echo .)nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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