{"thread":{"id":"18172","subject":"Fwd: how to have --no-ff be the default for all branch","startedAt":"2009-03-06T10:45:32Z","lastAt":"2009-03-06T17:01:25Z","messageCount":2,"participants":["jean-luc malet","Jay Soffian"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"107181","messageId":"1de9d39c0903060245u45373b8cq10d52f353c2214e2@mail.gmail.com","threadId":"18172","inReplyTo":"1de9d39c0903060244t2d39e9c8kd5791d097c84bbeb@mail.gmail.com","subject":"Fwd: how to have --no-ff be the default for all branch","fromName":"jean-luc malet","fromEmail":"jeanluc.malet@gmail.com","sentAt":"2009-03-06T10:45:32Z","receivedAt":"2009-03-06T10:45:32Z","isPatch":false,"sender":{"key":"jeanluc.malet@gmail.com","avatar":null},"body":"---------- Forwarded message ----------\nFrom: jean-luc malet <jeanluc.malet@gmail.com>\nDate: Fri, Mar 6, 2009 at 11:44 AM\nSubject: how to have --no-ff be the default for all branch\nTo: git@vger.kernel.org\n\n\nHi all!\nI'm using git for a time now and the thing that annoyed me the most is\nthat git \"loose\" branch information, ie if I have branch1 and master\nthat I do dev on branch1 (let say 3 commit) and that I want to deliver\non master, if there has not been any commit on master, when I do\ngit checkout master\ngit merge branch1\ngit branch -d branch1\n\nthen git resolve as fast forward and then make branch1 \"disapear\" (ie\non gitk I can't notice just by looking at the tree that there was a\nbranch there)\nthe solution is to use\ngit merge --no-ff branch1\n\nI would like that it is the default for all branch and that I use --ff\nwhen I want to do fast forward merge\nI know that I can set it up for one branch\ngit config add branch.master.mergeoption --no-ff\nbut I want it to be the default no just for one branch but for all branch\ngit config add branch.*.mergeoption --no-ff\ndon't work....\n\nhow can I do that?\nthanks\nJLM\n\n--\nKISS! (Keep It Simple, Stupid!)\n(garde le simple, imbécile!)\n\"mais qu'est-ce que tu m'as pondu comme usine à gaz? fait des choses\nsimples et qui marchent, espèce d'imbécile!\"\n-----------------------------\n\"Si vous pensez que vous êtes trop petit pour changer quoique ce soit,\nessayez donc de dormir avec un moustique dans votre chambre.\" Betty\nReese\nhttp://www.grainesdechangement.com/citations.htm\n\n\n\n--\nKISS! (Keep It Simple, Stupid!)\n(garde le simple, imbécile!)\n\"mais qu'est-ce que tu m'as pondu comme usine à gaz? fait des choses\nsimples et qui marchent, espèce d'imbécile!\"\n-----------------------------\n\"Si vous pensez que vous êtes trop petit pour changer quoique ce soit,\nessayez donc de dormir avec un moustique dans votre chambre.\" Betty\nReese\nhttp://www.grainesdechangement.com/citations.htm\n"},{"id":"107229","messageId":"76718490903060901j26308d42wfc288e522abee369@mail.gmail.com","threadId":"18172","inReplyTo":"1de9d39c0903060245u45373b8cq10d52f353c2214e2@mail.gmail.com","subject":"Re: how to have --no-ff be the default for all branch","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2009-03-06T17:01:25Z","receivedAt":"2009-03-06T17:01:25Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"2009/3/6 jean-luc malet <jeanluc.malet@gmail.com>:\n> I would like that it is the default for all branch and that I use --ff\n> when I want to do fast forward merge\n> I know that I can set it up for one branch\n> git config add branch.master.mergeoption --no-ff\n> but I want it to be the default no just for one branch but for all branch\n> git config add branch.*.mergeoption --no-ff\n> don't work....\n>\n> how can I do that?\n\nNot currently possible. The best you can do currently is to make an alias.\n\nIt would be a fairly trivial patch though to support merge.options. :-)\n\nj.\n"}]}