On Monday, 3 September 2012 18:33:03 UTC+1, Mauro Sanna wrote: > > On 3 September 2012 18:56, Antony Male <[email protected] <javascript:>> > wrote: > > On Monday, 3 September 2012 17:32:46 UTC+1, Mauro Sanna wrote: > >> > >> On 3 September 2012 18:13, Antony Male <[email protected]> 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. > There we go! Read up on the differences between fast-forward and non-fast-forward merges. [1] is a helpful resource.
Now, as you can see, fast-forward merges don't involve an actual merge commit. No merge commit = no commit message. Which is why you're not being prompted for a message for the fast-forward merge. [1]: http://sandofsky.com/images/fast_forward.pdf -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/dEQoZB9xQGsJ. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
