summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-17 14:38:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-17 14:38:17 -0700
commitf2c96ceb57afd8c64c3e3e656f9390c95e9fbec9 (patch)
treeb791b78d9dd9edb23dff810c1275b6f27671f742 /builtin/merge.c
parentTwelfth batch for 2.9 (diff)
parentsubmodule init: redirect stdout to stderr (diff)
downloadtgif-f2c96ceb57afd8c64c3e3e656f9390c95e9fbec9.tar.xz
Merge branch 'sb/submodule-init'
Update of "git submodule" to move pieces of logic to C continues. * sb/submodule-init: submodule init: redirect stdout to stderr submodule--helper update-clone: abort gracefully on missing .gitmodules submodule init: fail gracefully with a missing .gitmodules file submodule: port init from shell to C submodule: port resolve_relative_url from shell to C
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions