4 ms·
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 commi
by cpeterso 15y ago
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 15y agoDo 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-faulty-merge.txt http://kernel.org/pub/software/scm/git/docs/howto/revert-a-f...