diff options
| author |  Stefan Beller <sbeller@google.com> | 2017-03-14 14:46:37 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2017-03-16 14:07:16 -0700 |
| commit | 6e3c1595c66e2b192a2a516447c5645814766339 (patch) | |
| tree | 918c43a29b77a93f1a207c7998f7bdc5e4637fcb /merge-recursive.c | |
| parent | submodule.c: get_super_prefix_or_empty (diff) | |
| download | tgif-6e3c1595c66e2b192a2a516447c5645814766339.tar.xz | |
update submodules: add submodule_move_head
In later patches we introduce the options and flag for commands
that modify the working directory, e.g. git-checkout.
This piece of code will be used universally for
all these working tree modifications as it
* supports dry run to answer the question:
"Is it safe to change the submodule to this new state?"
e.g. is it overwriting untracked files or are there local
changes that would be overwritten?
* supports a force flag that can be used for resetting
the tree.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions