Fwd: how to have --no-ff be the default for all branch

Fwd: how to have --no-ff be the default for all branch

[jean-luc malet]

---------- Forwarded message ----------
From: jean-luc malet <jeanluc.malet@gmail.com>
Date: Fri, Mar 6, 2009 at 11:44 AM
Subject: how to have --no-ff be the default for all branch
To: git@vger.kernel.org


Hi all!
I'm using git for a time now and the thing that annoyed me the most is
that git "loose" branch information, ie if I have branch1 and master
that I do dev on branch1 (let say 3 commit) and that I want to deliver
on master, if there has not been any commit on master, when I do
git checkout master
git merge branch1
git branch -d branch1

then git resolve as fast forward and then make branch1 "disapear" (ie
on gitk I can't notice just by looking at the tree that there was a
branch there)
the solution is to use
git merge --no-ff branch1

I would like that it is the default for all branch and that I use --ff
when I want to do fast forward merge
I know that I can set it up for one branch
git config add branch.master.mergeoption --no-ff
but I want it to be the default no just for one branch but for all branch
git config add branch.*.mergeoption --no-ff
don't work....

how can I do that?
thanks
JLM

--
KISS! (Keep It Simple, Stupid!)
(garde le simple, imbécile!)
"mais qu'est-ce que tu m'as pondu comme usine à gaz? fait des choses
simples et qui marchent, espèce d'imbécile!"
-----------------------------
"Si vous pensez que vous êtes trop petit pour changer quoique ce soit,
essayez donc de dormir avec un moustique dans votre chambre." Betty
Reese
http://www.grainesdechangement.com/citations.htm



--
KISS! (Keep It Simple, Stupid!)
(garde le simple, imbécile!)
"mais qu'est-ce que tu m'as pondu comme usine à gaz? fait des choses
simples et qui marchent, espèce d'imbécile!"
-----------------------------
"Si vous pensez que vous êtes trop petit pour changer quoique ce soit,
essayez donc de dormir avec un moustique dans votre chambre." Betty
Reese
http://www.grainesdechangement.com/citations.htm

Re: how to have --no-ff be the default for all branch

[Jay Soffian]

2009/3/6 jean-luc malet <jeanluc.malet@gmail.com>:
> I would like that it is the default for all branch and that I use --ff
> when I want to do fast forward merge
> I know that I can set it up for one branch
> git config add branch.master.mergeoption --no-ff
> but I want it to be the default no just for one branch but for all branch
> git config add branch.*.mergeoption --no-ff
> don't work....
>
> how can I do that?

Not currently possible. The best you can do currently is to make an alias.

It would be a fairly trivial patch though to support merge.options. :-)

j.