On Thu, Sep 12, 2013 at 10:37:44 +0100,
David Howells wrote:
I presume that that would prevent valid merging between branches in the repo?
For example, I have a reasonably simple package that I apply patches to in the
master branch and then merge everything back into the last few Fedora vers
Pete Zaitcev wrote:
> Thought I was careful about them, but apparently not enough. So, does
> anyone have a script that can be attached to git hooks, reliably detects
> an attempt to push merge nodes, then bails the push?
I presume that that would prevent valid merging between branches in the re
On Wed, Sep 11, 2013 at 04:13:43PM -0600, Pete Zaitcev wrote:
> Dear All:
>
> I found that I pushed a merge node into Fedora git (fortunately it was
> only on f19 branch, not in Rawhide):
>
> commit 51eec48c20ba57054f17ba29f23e6a0aa36df9a4
> Merge: ac36771 f9213a5
> Author: Pete Zaitcev
> Date:
On Wed, Sep 11, 2013 at 06:35:54PM -0400, Sam Varshavchik wrote:
> Pete Zaitcev writes:
>
> >Dear All:
> >
> >I found that I pushed a merge node into Fedora git (fortunately it was
> >only on f19 branch, not in Rawhide):
> >
> >commit 51eec48c20ba57054f17ba29f23e6a0aa36df9a4
> >Merge: ac36771 f921
Pete Zaitcev writes:
Dear All:
I found that I pushed a merge node into Fedora git (fortunately it was
only on f19 branch, not in Rawhide):
commit 51eec48c20ba57054f17ba29f23e6a0aa36df9a4
Merge: ac36771 f9213a5
Author: Pete Zaitcev
Date: Wed Aug 7 12:14:15 2013 -0600
Merge branch 'f19'
