aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-07-22 12:55:47 -0700
committerJunio C Hamano <gitster@pobox.com>2012-07-22 12:55:48 -0700
commit15b3c82cbb345c890400119134fb9709790696d8 (patch)
tree8afe28b48bb2f23dd5b0d364b186a102ae73b0dd /git-am.sh
parent9cbd27b19a2df0484fb1f3a4a227abdbeab3c23d (diff)
parent6eafa6d096ce6b0ae20e4c0fbb248958559daf64 (diff)
downloadgit-15b3c82cbb345c890400119134fb9709790696d8.tar.gz
git-15b3c82cbb345c890400119134fb9709790696d8.tar.xz
Merge branch 'jl/maint-1.7.10-recurse-submodules-with-symlink'
When "git submodule add" clones a submodule repository, it can get confused where to store the resulting submodule repository in the superproject's .git/ directory when there is a symbolic link in the path to the current directory. * jl/maint-1.7.10-recurse-submodules-with-symlink: submodules: don't stumble over symbolic links when cloning recursively
Diffstat (limited to 'git-am.sh')
0 files changed, 0 insertions, 0 deletions