summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-10-10 15:56:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-10-10 15:56:17 -0700
commit61f9db7a50bca0642258c4541bdcd8bc97feb86b (patch)
treeb7f859c5b97afed54b5220445aa37c8ba6558486 /Documentation/git-merge-index.txt
parentMerge branch 'fg/submodule-git-file-git-dir' (diff)
parentadd update 'none' flag to disable update of submodule by default (diff)
downloadtgif-61f9db7a50bca0642258c4541bdcd8bc97feb86b.tar.xz
Merge branch 'hv/submodule-update-none'
* hv/submodule-update-none: add update 'none' flag to disable update of submodule by default submodule: move update configuration variable further up
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions