[PATCH 0/2] "git submodule update" enhancements (Was: What's cooking in git.git (May 2009, #04; Sun, 31))

[Johan Herland <johan@herland.net>]

> [Stalled and may need help and prodding to go forward]
>
> * ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit
>  + git-submodule: add support for --rebase.
>
> There was a discussion on --rebase vs --merge and needs for unified
> configuration variable handling for this patch...

Here is my previous patch, split in two, so as not to hold back the
introduction of "git submodule update --rebase": The first patch
changes the associated config variable from "submodule.<name>.rebase"
to "submodule.<name>.update", and the second patch introduces
"git submodule update --merge".

AFAIK, nobody objects to the first patch, so that one should be safe
to apply.

As for the second patch, Dscho has argued against it, although he
has not yet responded to my last email from a week ago. Nobody
(except me) has explicitly supported the patch, although both Avery
and yourself has questioned Dscho's arguments.

Not sure what I can do to bring the discussion toward a conclusion...


...Johan

Johan Herland (2):
  Rename submodule.<name>.rebase to submodule.<name>.update
  git-submodule: add support for --merge.

 Documentation/git-submodule.txt |   19 ++++++++--
 Documentation/gitmodules.txt    |   12 +++++-
 git-submodule.sh                |   43 ++++++++++++++--------
 t/t7406-submodule-update.sh     |   76 ++++++++++++++++++++++++++++++++++-----
 4 files changed, 119 insertions(+), 31 deletions(-)