diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2013-07-30 21:50:34 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-30 14:39:56 -0700 |
| commit | 5fee995244e13fd59500425d49038b00499396f8 (patch) | |
| tree | c0fe10fd933f099fbbdcd300cc3ae7b5c712d555 /Documentation/merge-strategies.txt | |
| parent | a88c915de9886fe17005a5daff4900ced0ea76ad (diff) | |
| download | git-5fee995244e13fd59500425d49038b00499396f8.tar.gz git-5fee995244e13fd59500425d49038b00499396f8.tar.xz | |
submodule.c: add .gitmodules staging helper functions
Add the new is_staging_gitmodules_ok() and stage_updated_gitmodules()
functions to submodule.c. The first makes it possible for call sites to
see if the .gitmodules file did contain any unstaged modifications they
would accidentally stage in addition to those they intend to stage
themselves. The second function stages all modifications to the
.gitmodules file, both will be used by subsequent patches for the mv
and rm commands.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions