Re: git merge behavior

2013-03-22 Thread Junio C Hamano
Yann Droneaud writes: > Thanks. I wasn't aware of the --no-ff-only option and > thought --no-ff would be the opposite of --ff-only, > or at least disable it given the order of the options. > > Please find a patch to document option --no-ff-only > > Documentation/merge-options.txt | 4 > 1

Re: git merge behavior

2013-03-22 Thread Yann Droneaud
Hi, Le 21.03.2013 21:31, Max Nanasy a écrit : Yann Droneaud opteya.com> writes: 3) Merge options can't be overridden. If I modify .git/config to set a merge option, for example forcing fast-forward merge, this option cannot be overridden on command line: (git merge --no-ff-only --no-ff

Re: git merge behavior

2013-03-21 Thread Max Nanasy
Yann Droneaud opteya.com> writes: > > 3) Merge options can't be overridden. > > If I modify .git/config to set a merge option, for example forcing > fast-forward merge, this option cannot be overridden on command line: > (git merge --no-ff-only --no-ff) should work. The --no-ff-only override

Re: git merge behavior

2013-03-20 Thread Junio C Hamano
Yann Droneaud writes: > But but do not take those remarks as a feature request. > I was just asking for clarification/comment on the behavior difference > between merging tag/tag object-id. If you are asking why things are as they are, the answer is simply because "git merge $(git rev-parse v1.2

Re: git merge behavior

2013-03-20 Thread Yann Droneaud
Hi, Le mercredi 20 mars 2013 à 19:04 +0100, Yann Droneaud a écrit : > > > 2) git merge VS git merge > > > > > > If is an object (not a lightweight/reference tag), git merge > > > ... > > > But, if you use the tag object-id instead of its name, for example using > > > git merge `git parse-rev

Re: git merge behavior

2013-03-20 Thread Yann Droneaud
Hi, Le mardi 19 mars 2013 à 09:19 -0700, Junio C Hamano a écrit : > Yann Droneaud writes: > > > 1) there's no mention of the git merge behavior in git-merge.1 > Yes; we welcome documentation patches. > Sent. > > 2) git merge VS git merge > > >

Re* git merge behavior

2013-03-19 Thread Junio C Hamano
Junio C Hamano writes: >> 2) git merge VS git merge >> ... >> It would be great to have Git using the tag message and check the >> signature. > > Perhaps, but if you feed the $(git rev-parse v1.12.2) to merge, your > subject will not be able to say "Merge tag 'v1.12.2'" in the first > place, so

Re: git merge behavior

2013-03-19 Thread Junio C Hamano
Yann Droneaud writes: > 1) there's no mention of the git merge behavior in git-merge.1 > > When asking Git to merge a tag (such as a signed tag or annotated tag), > it will always create a merge commit even if fast-forward was possible. > It's like having --no-ff pr

git merge behavior

2013-03-19 Thread Yann Droneaud
Hi, While trying to reproduce/understand the problems[1][2] I was facing when using Google's Git repo tool[3], I've found minor problems in Git: 1) there's no mention of the git merge behavior in git-merge.1 When asking Git to merge a tag (such as a signed tag or annotated tag),