Not sure how cherry-picking is managed, and whether commit is able to
see that we are doing a cherry-pick, and end it up properly. Anyway,
with Kevin's patch, we should be able to happily use cherry-pick
greg0ire
Le 03/03/2016 22:30, Junio C Hamano a écrit :
greg0ire <postmas...@greg0ire.fr> writes:
Steps to reproduce :
1. create a pre-commit hook
2. create a commit that fails the hook, and bypass the hook
3. checkout another branch
4. might be optional : create a conflicting change with the previously
created commit
5. cherry-pick the commit
6. might be optional : solve the conflick and use git cherry-pick --continue
Wouldn't "commit --no-verify" at that last step, instead of
"cherry-pick --continue", just work?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
