Jens Lehmann writes:
> Yup, but we should also mention '--merge' and '--rebase' here.
This has been sitting in the Stalled pile for quite a while and I am
getting tired of waiting. How does this look?
-- >8 --
From: Michal Sojka
Date: Mon, 3 Nov 2014 11:09:51 +0100
Subject: [PATCH] submodule:
Jens Lehmann writes:
> So I believe that gitmodules.txt should describe all ćonfig
> options that can be provided by upstream (and e.g. mention that
> the 'url' and 'update' values are copied into .git/config on
> init), while all settings that can be overridden locally should
> be documented in
Am 04.11.2014 um 00:08 schrieb Junio C Hamano:
Michal Sojka writes:
Or something perhaps? Or the detailed description of
submodule.$name.update should be dropped from here and refer the
reader to config.txt instead?
I guess you mean gitmodules.txt.
Actually, I do mean the configuration. .
Michal Sojka writes:
> This sounds good, but it doesn't mention the `!command` value of
> .update.
That part is unchanged by what I did. My rewrite was up to
... by specifying `--checkout`.
of the existing text.
>> Or something perhaps? Or the detailed description of
>> submodule.$n
On Mon, Nov 03 2014, Junio C Hamano wrote:
> Jens Lehmann writes:
>
>> This was introduced in e6a1c43aaf (document submdule.$name.update=none
>> option for gitmodules), and I agree with Michal that we should fix it.
>> But I think we should rather say "This can be overridden by specifying
>> '--me
Jens Lehmann writes:
> This was introduced in e6a1c43aaf (document submdule.$name.update=none
> option for gitmodules), and I agree with Michal that we should fix it.
> But I think we should rather say "This can be overridden by specifying
> '--merge', '--rebase' or `--checkout`." here, as the ot
On Mon, Nov 03 2014, Junio C Hamano wrote:
> I did a bit more digging of the history, and came up with this,
> which would be with a clearer and fairer description. Also to
> clarify, I spelled what Michal's "This" meant to refer to.
>
> -- >8 --
> From: Michal Sojka
> Date: Mon, 3 Nov 2014 11:09
Am 03.11.2014 um 21:53 schrieb Junio C Hamano:
I did a bit more digging of the history, and came up with this,
which would be with a clearer and fairer description. Also to
clarify, I spelled what Michal's "This" meant to refer to.
-- >8 --
From: Michal Sojka
Date: Mon, 3 Nov 2014 11:09:51 +01
I did a bit more digging of the history, and came up with this,
which would be with a clearer and fairer description. Also to
clarify, I spelled what Michal's "This" meant to refer to.
-- >8 --
From: Michal Sojka
Date: Mon, 3 Nov 2014 11:09:51 +0100
Subject: [PATCH] submodule: clarify documentat
Am 03.11.2014 um 20:02 schrieb Junio C Hamano:
Michal Sojka writes:
The documentation says that submodule.$name.update can be overridden by
--checkout only if its value is `none`. This is not true, because both
implementation and documentation of --checkout specifies that the
override applies
Michal Sojka writes:
> The documentation says that submodule.$name.update can be overridden by
> --checkout only if its value is `none`. This is not true, because both
> implementation and documentation of --checkout specifies that the
> override applies to all possible values.
>
> Signed-off-by:
The documentation says that submodule.$name.update can be overridden by
--checkout only if its value is `none`. This is not true, because both
implementation and documentation of --checkout specifies that the
override applies to all possible values.
Signed-off-by: Michal Sojka
---
Documentation/
12 matches
Mail list logo
