summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-06-16 15:18:18 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-17 13:30:01 -0700
commit091a6eb0feed820a43663ca63dc2bc0bb247bbae (patch)
treeb4a6a61b74de57b56288d17b3613193a616c06db /builtin/merge.c
parentrev-parse: add --prefix option (diff)
downloadtgif-091a6eb0feed820a43663ca63dc2bc0bb247bbae.tar.xz
submodule: drop the top-level requirement
Use the new rev-parse --prefix option to process all paths given to the submodule command, dropping the requirement that it be run from the top-level of the repository. Since the interpretation of a relative submodule URL depends on whether or not "remote.origin.url" is configured, explicitly block relative URLs in "git submodule add" when not at the top level of the working tree. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions