summaryrefslogtreecommitdiff
path: root/contrib/svn-fe/Makefile
diff options
context:
space:
mode:
authorLibravatar Leif Middelschulte <Leif.Middelschulte@gmail.com>2018-05-17 11:40:08 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-18 07:59:13 +0900
commit76f421259718f5f504558e97dfb99e16c9ceb7c6 (patch)
tree945b6bc8416b27cce602329fc4e45d39d42a97ac /contrib/svn-fe/Makefile
parentmerge-recursive: i18n submodule merge output and respect verbosity (diff)
downloadtgif-76f421259718f5f504558e97dfb99e16c9ceb7c6.tar.xz
merge-recursive: give notice when submodule commit gets fast-forwarded
Inform the user about an automatically fast-forwarded submodule. The silent merge behavior was introduced by commit 68d03e4a6e44 ("Implement automatic fast-forward merge for submodules", 2010-07-07)). Signed-off-by: Leif Middelschulte <Leif.Middelschulte@gmail.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/svn-fe/Makefile')
0 files changed, 0 insertions, 0 deletions