The Church of Scotland has voted to draft new laws which would allow ministers to conduct same-sex marriages.
Rev Bryan Kerr's motion, as amended, was passed 345 to 170 at the General Assembly in Edinburgh on Saturday.
The Legal Questions Committee now has two years before it has to report back, with a final poll expected in 2021.
Speaking before the vote, Rev Tom Gordon said: "I have two daughters, both of whom are married.
"I have one gay daughter in a same-sex marriage.
"When my older daughter got married she had a choice - to ask me to conduct her service as a minister or for me to walk her down the aisle as her dad.
"But when my younger daughter got married, she had no such choice.
"Give people a choice - allow their marriage to be conducted by a minister.
He added: "With God's blessing."
Fears were raised by others in the assembly about whether relevant safeguards would be in place to protect those who did not wish to perform the ceremonies.
Rev Mark Malcolm claimed he would be willing to "give up" his right to conduct all marriages and only do blessings, as a compromise for the "peace of the church".
He said people who do not support same-sex marriage within the church have been described as "bigots".
Rev Malcolm added: "Legislation isn't going to protect, because perception is everything."
The amended motion, as passed, outlines that the legislation would allow ministers who wish to perform same-sex marriages to do so.
It also sets out that the draft law should provide safeguards for those who do not wish to.
In June last year, the Scottish Episcopal Church took the "momentous" decision to allow same-sex couples to be married in church.
The historic move made it the first branch of the Anglican faith in the UK to allow same-sex marriage.
The General Assembly meets for a week every year in May.
It has the authority to make laws determining how the Church operates and can also act as the Kirk's highest court.
This year's Assembly closes on May 25.
Why are you making commenting on The Herald only available to subscribers?
It should have been a safe space for informed debate, somewhere for readers to discuss issues around the biggest stories of the day, but all too often the below the line comments on most websites have become bogged down by off-topic discussions and abuse.
heraldscotland.com is tackling this problem by allowing only subscribers to comment.
We are doing this to improve the experience for our loyal readers and we believe it will reduce the ability of trolls and troublemakers, who occasionally find their way onto our site, to abuse our journalists and readers. We also hope it will help the comments section fulfil its promise as a part of Scotland's conversation with itself.
We are lucky at The Herald. We are read by an informed, educated readership who can add their knowledge and insights to our stories.
That is invaluable.
We are making the subscriber-only change to support our valued readers, who tell us they don't want the site cluttered up with irrelevant comments, untruths and abuse.
In the past, the journalist’s job was to collect and distribute information to the audience. Technology means that readers can shape a discussion. We look forward to hearing from you on heraldscotland.com
Comments & Moderation
Readers’ comments: You are personally liable for the content of any comments you upload to this website, so please act responsibly. We do not pre-moderate or monitor readers’ comments appearing on our websites, but we do post-moderate in response to complaints we receive or otherwise when a potential problem comes to our attention. You can make a complaint by using the ‘report this post’ link . We may then apply our discretion under the user terms to amend or delete comments.
Post moderation is undertaken full-time 9am-6pm on weekdays, and on a part-time basis outwith those hours.
Read the rules here