From: Johan Herland <johan@herland.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, markus.heidelberg@web.de,
Peter Hutterer <peter.hutterer@who-t.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: What's cooking in git.git (May 2009, #02; Sun, 17)
Date: Tue, 19 May 2009 09:23:33 +0200 [thread overview]
Message-ID: <200905190923.33874.johan@herland.net> (raw)
In-Reply-To: <7vpre5anaz.fsf@alter.siamese.dyndns.org>
On Tuesday 19 May 2009, Junio C Hamano wrote:
> Johan Herland <johan@herland.net> writes:
> > After some thinking, I don't like my original name
> > submodule.<name>.resolve, since ".resolve" sounds more like a merge
> > strategy or conflict resolution method, than a "how to deal with
> > submodule update" choice. I propose submodule.<name>.update instead.
>
> Sounds like a plan, even though I do not necessarily agree with the idea
> of automatically rebinding what is at the submodule path every time you
> update the toplevel project tree.
I agree that in many workflows this does not make sense, but I believe that
(as with 'git submodule update --rebase') there are some cases where it does
make sense, and I see no reason to support one, but not the other.
> And from my point of view, "rebind" (or "autorebind") would be more
> appropriate name than "update"
Feel free to fix up my patch with whatever the community finds most
appropriate. Personally, I still like "update" better because it determines
what "happens" on a git submodule update, but I'm not religious about this.
> (and I would probably set it to "never").
That's perfectly ok. So will I, in most of my repos. But there are cases
(e.g. in the workflows at $dayjob) where this feature will be very valuable.
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
next prev parent reply other threads:[~2009-05-19 7:23 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-17 8:05 What's cooking in git.git (May 2009, #02; Sun, 17) Junio C Hamano
2009-05-17 9:45 ` Jakub Narebski
2009-05-17 17:58 ` Junio C Hamano
2009-05-17 18:27 ` Jakub Narebski
2009-05-17 11:41 ` David Aguilar
2009-05-18 13:36 ` Johan Herland
2009-05-18 19:40 ` Markus Heidelberg
2009-05-18 21:55 ` Johan Herland
2009-05-19 0:35 ` [PATCH] git-submodule: add support for --merge Johan Herland
2009-05-19 1:33 ` What's cooking in git.git (May 2009, #02; Sun, 17) Junio C Hamano
2009-05-19 7:23 ` Johan Herland [this message]
2009-05-19 8:17 ` Johannes Schindelin
2009-05-19 8:45 ` Johan Herland
2009-05-19 11:53 ` Johannes Schindelin
2009-05-19 13:26 ` git submodule update --merge (Was: What's cooking in git.git (May 2009, #02; Sun, 17)) Johan Herland
2009-05-25 11:59 ` Johan Herland
2009-05-25 18:33 ` git submodule update --merge Junio C Hamano
2009-05-25 18:57 ` Johannes Schindelin
2009-05-25 19:04 ` Avery Pennarun
2009-05-25 19:54 ` Johannes Schindelin
2009-05-25 22:48 ` Johan Herland
2009-05-25 22:10 ` Johan Herland
2009-05-25 23:15 ` git submodule update --merge (Was: What's cooking in git.git (May 2009, #02; Sun, 17)) Peter Hutterer
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=200905190923.33874.johan@herland.net \
--to=johan@herland.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus.heidelberg@web.de \
--cc=peter.hutterer@who-t.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).