On Fri, Feb 20, 2015 at 10:16:18PM -0700, Technext wrote: > Thanks Junio for the prompt reply! :) Yes, that's exactly how i would like > things to be. I'll definitely try to push this thing and see if this flow > can be implemented. > > However, can you please guide me whether there's any way i could have > figured out about the git reset command that the developer executed on his > local? (my first query) git reset . is just a local working tree operation, which does not leave something behind, just like when the user would do any other file operations and comitted that. This created a so called evil merge, which are not easy to detect (see [1] for some possible solutions) > > Also, am i right in thinking that a check cannot be implemented using hooks > or any other similar way? (my second query) Because an evil merge is hard to detect, it's even harder to do it automated in a script. Human review works much better for this (when merging in the changes from the developer). [1]: https://stackoverflow.com/a/27744011/20261 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html