summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-01-25 15:48:51 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-01-26 11:06:07 -0800
commite7b37caf4feace4ee799570285b4699b23e0581f (patch)
tree8c427debfab2d71bebf7cb9273a8518220ad5e61 /mergetools/vimdiff
parentpreparing for 2.10.3 (diff)
downloadtgif-e7b37caf4feace4ee799570285b4699b23e0581f.tar.xz
submodule update: run custom update script for initial populating as well
In 1b4735d9f3 (submodule: no [--merge|--rebase] when newly cloned, 2011-02-17), all actions were defaulted to checkout for populating a submodule initially, because merging or rebasing makes no sense in that situation. Other commands however do make sense, such as the custom command that was added later (6cb5728c43, submodule update: allow custom command to update submodule working tree, 2013-07-03). I am unsure about the "none" command, as I can see an initial checkout there as a useful thing. On the other hand going strictly by our own documentation, we should do nothing in case of "none" as well, because the user asked for it. Reported-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions