summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2017-04-13 15:08:54 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-13 18:05:23 -0700
commit9af7ec30cbd4b4ce9e071cd0d54297101f98b426 (patch)
treecb02af7f88fbf59ffd1a422e3e101ed6ab752323 /merge-recursive.c
parentsubmodule add: respect submodule.active and submodule.<name>.active (diff)
downloadtgif-9af7ec30cbd4b4ce9e071cd0d54297101f98b426.tar.xz
submodule--helper: fix typo in is_active error message
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