|
From: | Gary V. Vaughan |
Subject: | Re: [SCM] GNU Libtool branch, master, updated. v2.2.4-43-gcbe0c8e |
Date: | Sun, 7 Sep 2008 16:12:30 +0800 |
Hallo Ralf, On 7 Sep 2008, at 15:21, Ralf Wildenhues wrote:
+ # HELP?!? How to check for git push conflicts?Not sure why needed. git push will not, unless you force it, push something that is not a fast-forward of the remote tree.The original cvs commit script used to "cvs -nq update | grep '^C'" and diagnose an impending conflict and bail out before doing anything else. I don't know if there is some way to dry-run the push and see whether it is doomed before actually trying it too, or even whether that makes sense for git?Doesn't `git push --dry-run' provide this information (untested)?
I'm sure it does, but I don't know what it looks like, or how to parse it :( Cheers, Gary -- Email me: address@hidden ._(() Read my blog: http://blog.azazil.net \' ) And my other blog: http://www.machaxor.net =( \ ...and my book: http://sources.redhat.com/autobook _(~_)'
[Prev in Thread] | Current Thread | [Next in Thread] |