On 3 September 2012 18:56, Antony Male <antony.m...@gmail.com> wrote:
> On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote:
>>
>> On 3 September 2012 18:13, Antony Male <anton...@gmail.com> wrote:
>> > On Monday, 3 September 2012 12:19:11 UTC+1, Mauro Sanna wrote:
>> >>
>> >> Then I do a git checkout master, git merge devel and push and all done.
>> >> I always have done this but now, in a new application, when I do git
>> >> merge
>> >> devel into master it asks me for a commit message.
>> >
>> >
>> > In version 1.7.10, git started prompting for a commit message after
>> > every
>> > merge. The rationale behind this is explained in Junio's (the
>> > maintainer's)
>> > blog post [1]
>>
>> Ok but, why it don't ask for a commit message when used in some other
>> projects?
>> .git/config is the same.
>> Perhaps because I've set the repository using git before 1.7.10?
>
>
> Maybe in one project the merges you're doing are non-fast-forward (as you
> stated), whereas in the others they're fast-forward? Maybe there's a
> configuration difference? (I didn't think there was a config key to disable
> this behaviour, but it's worth a check).


Here the config for two of my projects.
The first is not fast-forward while in the second the merge is fast-forward.
As you can see there are no differences.
So I don't understand why the merge of the first project is not
fast-forward and asks for a commit message.

[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        url = ssh://192.168.241.11/var/git-repos/bbb_rails.git
        fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
        remote = origin
        merge = refs/heads/master
[branch "devel"]
        remote = origin
        merge = refs/heads/devel



[core]
        repositoryformatversion = 0
        filemode = true
        bare = false
        logallrefupdates = true
[remote "origin"]
        fetch = +refs/heads/*:refs/remotes/origin/*
        url = ssh://192.168.241.11:/var/git-repos/operatorieconomici.git
[branch "master"]
        remote = origin
        merge = refs/heads/master
[branch "devel"]
        remote = origin
        merge = refs/heads/devel

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to