[PATCH 0/3] pull: optionally rebase submodules

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This supersedes the RFC in May by Brandon
https://public-inbox.org/git/20170511172437.96878-1-bmwill@xxxxxxxxxx/

It adds more (enough?) error checking, as explained in the last
commit message.

Documentation and issues raised in the review
of that RFC have been addressed.

The first two patches are a little refactoring needed for the last patch
that adds the functionality.

Thanks,
Stefan

Stefan Beller (3):
  builtin/fetch: factor submodule recurse parsing out to submodule
    config
  builtin/fetch: parse recurse-submodules-default at default options
    parsing
  pull: optionally rebase submodules (remote submodule changes only)

 Documentation/git-pull.txt | 12 ++++----
 builtin/fetch.c            | 37 ++++++++---------------
 builtin/pull.c             | 73 +++++++++++++++++++++++++++++++++++++++-------
 submodule-config.c         | 22 ++++++++++++++
 submodule-config.h         |  3 ++
 submodule.c                | 26 +++++++++++++++++
 submodule.h                |  4 +++
 t/t5572-pull-submodule.sh  | 58 ++++++++++++++++++++++++++++++++++++
 8 files changed, 194 insertions(+), 41 deletions(-)

-- 
2.12.2.575.gb14f27f917




[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux