12:20 a.m.
If you want to prevent merge commits from ever entering a particular
branch of yours, say master, just do this:
git config branch.master.mergeoptions --ff-only
--
Jason T. Greene
JBoss AS Lead / EAP Platform Architect
JBoss, a division of Red Hat
2:39 p.m.
I have been looking around some git docs, but can't find an answer to
this. So asking here - Is it possible to set this option per (remote)
repo level instead of per (local) branch level? For example,
irrespective of which local branch I'm on (which I later push upstream),
I don't want to accidentally push non-fast forwardable revisions to
upstream. Is that possible?
-Jaikiran
On Thursday 08 September 2011 12:20 AM, Jason T. Greene wrote:
If you want to prevent merge commits from ever entering a particular
branch of yours, say master, just do this:
git config branch.master.mergeoptions --ff-only
2:43 p.m.
On Friday 13 July 2012 02:39 PM, Jaikiran Pai wrote:
I have been looking around some git docs, but can't find an
answer to
this. So asking here - Is it possible to set this option per (remote)
repo level instead of per (local) branch level? For example,
irrespective of which local branch I'm on (which I later push upstream),
I don't want to accidentally push non-fast forwardable revisions to
upstream. Is that possible?
Well, not accidentally since git does prevent it unless
you use -f
option during push. So I guess what I am looking for is, as an admin
configure my remote repo to only allow fast forward commits. Now that I
think of it I guess this is more of a github option than git.
-Jaikiran
-Jaikiran
On Thursday 08 September 2011 12:20 AM, Jason T. Greene wrote:
> If you want to prevent merge commits from ever entering a particular
> branch of yours, say master, just do this:
>
> git config branch.master.mergeoptions --ff-only
>
_______________________________________________
jboss-as7-dev mailing list
jboss-as7-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/jboss-as7-dev
3:36 p.m.
When I am merging to push upstream I try and always use the --ff-only option when merging,
and also check with gitk before I push, to make sure there are no merge commits
Sent from my iPhone
On 13/07/2012, at 19:13, Jaikiran Pai <jpai(a)redhat.com> wrote:
On Friday 13 July 2012 02:39 PM, Jaikiran Pai wrote:
> I have been looking around some git docs, but can't find an answer to
> this. So asking here - Is it possible to set this option per (remote)
> repo level instead of per (local) branch level? For example,
> irrespective of which local branch I'm on (which I later push upstream),
> I don't want to accidentally push non-fast forwardable revisions to
> upstream. Is that possible?
Well, not accidentally since git does prevent it unless you use -f
option during push. So I guess what I am looking for is, as an admin
configure my remote repo to only allow fast forward commits. Now that I
think of it I guess this is more of a github option than git.
-Jaikiran
>
> -Jaikiran
> On Thursday 08 September 2011 12:20 AM, Jason T. Greene wrote:
>> If you want to prevent merge commits from ever entering a particular
>> branch of yours, say master, just do this:
>>
>> git config branch.master.mergeoptions --ff-only
>>
>
> _______________________________________________
> jboss-as7-dev mailing list
> jboss-as7-dev(a)lists.jboss.org
> https://lists.jboss.org/mailman/listinfo/jboss-as7-dev
_______________________________________________
jboss-as7-dev mailing list
jboss-as7-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/jboss-as7-dev
4471
days inactive
4781
days old
3 comments
3 participants
participants (3)
-
Jaikiran Pai -
Jason T. Greene -
Stuart Douglas