My daughter was like that...I feel for you!! My advice is to nip it in the bud now before it gets worse. I was to the point where I had to sleep (if you can call it that)out in the living room with her, with the TV on for light. I'd finally get her to sleep and lay her down in the bassinet then I'd lay down to try to get a couple of minutes of sleep when she'd wake up after 15 minutes or so and the cycle started over...it didn't start that bad, but it just progressively got worse until I was ragged and mean from lack of sleep. It's not fair to you, your baby, or anyone else that has to deal with you.
So, my advice is to let the stinker cry a little. I know it's SO hard to hear it and it tears you apart, but it's the only way I found that worked. I'd go through my nightly routine for baby, bath, feeding, etc. then put her in bed and tell her I love her and walk away. If she cries hysterically, go in after 5 minutes (DO NOT pick her up) and pat her tummy and talk soothingly to her. You could prop up a bottle if you want, but that's another habit you'll have to break later. If she didn't stop crying (and she usually didn't) just say "I'm sorry you're sad. Try to get some sleep" and leave again. Then go back in after a longer period (10-15 minutes) and repeat. Make each subsequent interval longer than the previous.
My daughter cried for about 45 minutes the first night but slept much better through the night, only waking up 2 or 3 times instead of constantly. The second night she cried for about 20 minutes then was out. The third night she didn't cry at all, just went to sleep. It may work differently with different babies, but I've used this method several times (weaning from a bottle, from bassinet to crib, etc) and it always works. It may seem mean, but I've found that she wakes up happier and sleeps better when she does it herself. After all, she's missing sleep because of her habit right along with you! And you'll hear people trash on the "cruelty" of it, but it works and it makes everyone happier. There are books supporting all kinds of baby-raising, and everyone's got their own "bible" for babies, but you've got to do what works for you and your family. Good luck!