>> On Wed, 27 Nov 2013 15:17:27 +0000 >> Pete Forman <petef4+usenet@xxxxxxxxx> wrote: >> >>> I am looking for a way of detecting up front whether a git pull or git >>> merge would fail. The sort of script I want to perform is to update a >>> server. >>> >>> git fetch >>> git okay >>> stop server >>> backup data >>> git merge >>> start server >>> > I don't know a simple way to do the pre-merge check without actually > doing the merge (other than patching git merge to add a --dry-run > option) Wouldn't that be a nice use-case for git-recursive-merge --index-only ($gmane/236753) ? -- 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