Nevermind. It's working as it should. The script that was doing the cherry-pick was doing it in an if and I neglected to exit with a non-zero status. Sorry for the noise. On Wed, Nov 2, 2016 at 8:14 AM, Kevin Layer <layer@xxxxxxxxx> wrote: > If the cherry-pick fails due to a merge conflict, it just returns an > exit status of 0. I have a script that does a series of cherry-picks > and I need to know if they succeed. > > I'm sure this has been covered before. > > Using git version 1.8.3.1. > > Thank you. > > Kevin