summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-06 14:53:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-06 14:53:25 -0700
commitcc601901a7a9619b706cb10a6fdc1e6246b6da53 (patch)
treeb8a81b3876cf1a4c5429815ddc6733696d77090b /merge-blobs.h
parentMerge branch 'ky/imap-send-openssl-1.1.0' into maint (diff)
parentt7407: make expectation as clear as possible (diff)
downloadtgif-cc601901a7a9619b706cb10a6fdc1e6246b6da53.tar.xz
Merge branch 'sb/submodule-path-misc-bugs' into maint
"git submodule" reports the paths of submodules the command recurses into, but this was incorrect when the command was not run from the root level of the superproject. * sb/submodule-path-misc-bugs: t7407: make expectation as clear as possible submodule update: test recursive path reporting from subdirectory submodule update: align reporting path for custom command execution submodule status: correct path handling in recursive submodules submodule update --init: correct path handling in recursive submodules submodule foreach: correct path display in recursive submodules
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions