aboutsummaryrefslogtreecommitdiff
path: root/git-merge-stupid.sh
diff options
context:
space:
mode:
authorMartin Waitz <tali@admingilde.org>2006-05-07 20:19:09 +0200
committerJunio C Hamano <junkio@cox.net>2006-05-07 15:33:43 -0700
commitcf9dc65368113caa28f2829e2ada5477fbb031ec (patch)
treee3a58d8e1caba863f578844a9b7fe06f47339161 /git-merge-stupid.sh
parent6fe31e2e4cdb7ed5333107174e23fbf2e226e370 (diff)
downloadgit-cf9dc65368113caa28f2829e2ada5477fbb031ec.tar.gz
git-cf9dc65368113caa28f2829e2ada5477fbb031ec.tar.xz
clone: keep --reference even with -l -s
Both -l -s and --reference update objects/info/alternates and used to write over each other. Signed-off-by: Martin Waitz <tali@admingilde.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-stupid.sh')
0 files changed, 0 insertions, 0 deletions