summaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-06-21 14:41:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-21 14:41:53 -0700
commit486fcbc458ecb1ee906dcb67a8a7bfe933614111 (patch)
tree82f3cc51ee866448684b81ecebfb82603533bc36 /git-merge-resolve.sh
parentMerge branch 'jc/bundle-complete-notice' (diff)
parentclone: allow --no-local to turn off local optimizations (diff)
downloadtgif-486fcbc458ecb1ee906dcb67a8a7bfe933614111.tar.xz
Merge branch 'jk/clone-local'
"git clone --local $path" started its life as an experiment to optionally use link/copy when cloning a repository on the disk, but we didn't deprecate it after we made the option a no-op to always use the optimization. The command learns "--no-local" option to turn this off, as a more explicit alternative over use of file:// URL. * jk/clone-local: clone: allow --no-local to turn off local optimizations docs/clone: mention that --local may be ignored
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions