t+1 - Latest Comments in Undo a fast-forward git merge

Re: Undo a fast-forward git merge

firewolf006 — Tue, 30 Jun 2015 10:46:19 -0000

Thanks, this post just saved my day

Re: Undo a fast-forward git merge

Matt Wilson — Wed, 24 Jul 2013 13:43:47 -0000

Great! Glad it helped

Re: Undo a fast-forward git merge

Raif — Wed, 24 Jul 2013 13:40:47 -0000

sweet jesus. I know that git "never looses your data" but I couldn't find it for the life of me. this command showed me just the right commit to reset to. Thanks.

Re: Undo a fast-forward git merge

Geoff — Wed, 08 May 2013 14:03:29 -0000

for newbies like me who could not find the .gitconfig file, here is the Git Bash command equivalent:

git config --global merge.ff false

Thanks!!

Re: Undo a fast-forward git merge

Matt Wilson — Tue, 23 Apr 2013 09:15:15 -0000

Didn't know that configuration trick! Thanks so much for passing that along.

Re: Undo a fast-forward git merge

Vincent Riquer — Tue, 23 Apr 2013 09:03:44 -0000

Thanks!
Also, add
[merge]
ff = false

to your git configuration to make this the default.

Re: Undo a fast-forward git merge

Matt Wilson — Fri, 27 Apr 2012 14:45:13 -0000

That's great! Glad to help.

Re: Undo a fast-forward git merge

Ian Cumings — Fri, 27 Apr 2012 14:39:32 -0000

This just saved me - many thanks!

Re: Undo a fast-forward git merge

Biekei Ojo — Sun, 08 Apr 2012 17:01:53 -0000

great. explained two things ( forcing git to commit a FF and how to revert a fault FF commit). thanks man

Re: Undo a fast-forward git merge

Matt Wilson — Fri, 25 Nov 2011 14:26:10 -0000

Yeah, are you having trouble with it?

Re: Undo a fast-forward git merge

Joe — Wed, 23 Nov 2011 21:10:20 -0000

Did you ever figure this out yet?

HGH
HGH Blog
Genf20

Re: Undo a fast-forward git merge

Matt Wilson — Mon, 03 Oct 2011 21:38:47 -0000

Hey Nick!

So good to hear from you.

pinterest is going to be freakin' huge. I know that because several women I know all are obsessed with it, and none of them know each other.

What are you up to these days? Let's catch up.

Matt

Re: Undo a fast-forward git merge

Nick W. — Mon, 03 Oct 2011 21:35:22 -0000

Matt,

Hope you are well. Great collection of posts on this blog.

Off topic, I thought you might be interested in this website pinterest.com, which utilizes Python. (One of the site's cofounders is a former coworker of mine.)

Best regards to you and your family,
Nick