From: Markus Heidelberg <markus.heidelberg@web•de>
To: Johan Herland <johan@herland•net>
Cc: Peter Hutterer <peter.hutterer@who-t•net>,
git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>,
Johannes Schindelin <Johannes.Schindelin@gmx•de>
Subject: Re: What's cooking in git.git (May 2009, #02; Sun, 17)
Date: Mon, 18 May 2009 21:40:29 +0200 [thread overview]
Message-ID: <200905182140.29953.markus.heidelberg@web.de> (raw)
In-Reply-To: <200905181536.39508.johan@herland.net>
Johan Herland, 18.05.2009:
> On Sunday 17 May 2009, Junio C Hamano wrote:
> > [Will merge to "master" soon]
> >
> > * ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
> > + git-submodule: add support for --rebase.
>
> [..]
>
> Now, my question should not stop this feature from going into 'master',
> except for the fact that if we also want to support merge, we should
> rename the associated config variable:
>
> Instead of
>
> submodule.<name>.rebase = true/false (false if unset)
>
> we should have something like
>
> submodule.<name>.resolve = checkout/rebase/merge (checkout if unset)
At least this would be inconsistent with options like
branch.<name>.merge and branch.<name>.rebase
Markus
next prev parent reply other threads:[~2009-05-18 19:44 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 [this message]
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
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=200905182140.29953.markus.heidelberg@web.de \
--to=markus.heidelberg@web$(echo .)de \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=johan@herland$(echo .)net \
--cc=peter.hutterer@who-t$(echo .)net \
/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