summaryrefslogtreecommitdiff
path: root/sha1-lookup.c
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2010-08-17 07:10:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-18 21:02:05 (GMT)
commitf07df52489c78c33c5c5c1bd973038283c401582 (patch)
treea575b81623a2766dce1188e37dd76d45e92c4804 /sha1-lookup.c
parentd9a680acf68caef16b5f316ed7917d8160d3578a (diff)
downloadgit-f07df52489c78c33c5c5c1bd973038283c401582.zip
git-f07df52489c78c33c5c5c1bd973038283c401582.tar.gz
git-f07df52489c78c33c5c5c1bd973038283c401582.tar.bz2
merge script: --ff-only to disallow true merge
Port v1.6.6-rc0~62^2 (Teach 'git merge' and 'git pull' the option --ff-only, 2009-10-29) to the old merge script. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-lookup.c')
0 files changed, 0 insertions, 0 deletions