A --no-ff merge also makes reverting a change from master easier because there i... | Hacker News

Hacker Newsnew | past | comments | ask | show | jobs | submit

cpeterso on Aug 1, 2011 | parent | context | favorite | on: Understanding the Git Workflow

A --no-ff merge also makes reverting a change from master easier because there is just one commit. You don't need to dig through the log to find the first commit from the merged branch fast-forwarded onto master.

fr0sty on Aug 2, 2011 [–]

Do you actually mean "revert" there or are you talking about rewinding?

using "git revert <merge_commit>" is very nasty[1]. using 'git reset <before_bad_merge> is less so.

[1]http://kernel.org/pub/software/scm/git/docs/howto/revert-a-f...

Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact