summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2016-05-26 14:59:42 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-27 10:40:45 -0700
commit37f52e93441e1da00c9c9824ed03cd074d77f43a (patch)
tree778ea059c537026a4444b06b666b0831b2a5c860 /contrib/examples/git-merge.sh
parentSync with maint (diff)
downloadtgif-37f52e93441e1da00c9c9824ed03cd074d77f43a.tar.xz
submodule-config: keep shallow recommendation around
The shallow field will be used in a later patch by `submodule update`. To differentiate between the actual depth (which may be different), we name it `recommend_shallow` as the field in the .gitmodules file is only a recommendation by the project. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions