summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-05-01 21:12:25 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-05-01 21:12:25 -0700
commit17f695b479546c691f797a5f1d153fbb3010fb2f (patch)
treef19c955969fab844c15284f21d2643f18da013c1 /Documentation/git-merge-file.txt
parentMerge branch 'jc/maint-blame-minimal' into maint (diff)
parentsubmodules: recursive fetch also checks new tags for submodule commits (diff)
downloadtgif-17f695b479546c691f797a5f1d153fbb3010fb2f.tar.xz
Merge branch 'jl/maint-submodule-recurse-fetch' into maint
"git fetch" that recurses into submodules on demand did not check if it needs to go into submodules when non branches (most notably, tags) are fetched. By Jens Lehmann * jl/maint-submodule-recurse-fetch: submodules: recursive fetch also checks new tags for submodule commits
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions