summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar Thomas Rast <trast@student.ethz.ch>2010-10-18 15:11:25 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-10-19 14:15:59 -0700
commit1bb28d87e1d8897db662f48455d369860758fbdd (patch)
treee8aaa30537c6a8cc4c2919ddcac183fc4b907cf5 /contrib/examples/git-merge.sh
parentMerge branch 'maint' (diff)
downloadtgif-1bb28d87e1d8897db662f48455d369860758fbdd.tar.xz
{cvs,svn}import: use the new 'git read-tree --empty'
Since fb1bb96 (read-tree: deprecate syntax without tree-ish args, 2010-09-10) not passing --empty caused a spurious warning that was shown to the user. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions