Re: [Fwd: Issue with Merge Commits and using 'git pull --rebase' (Was: Re: Trying to understand git)]

[Elijah Newren <newren gmail com>]

On Mon, Apr 20, 2009 at 8:40 PM, Behdad Esfahbod <behdad behdad org> wrote:
> FYI.
>
> -------- Original Message --------
> Oh, you did a 'merge-commit'. I did one of those to 'gtk+', no less...
> The technical description is at
> http://live.gnome.org/Git/Help/ExtraMergeCommits
> and apparently, now, git.gnome.org is supposed to detect those and
> give you an error message.
> It is not clear why your commit was not caught in your case.

Isn't Owen's hook set up to check for commit messages of the form:
  Merge branch.*of (git|ssh)://.*
?
If the user has a conflict after doing a 'git pull', fixes the
conflict, and then commits, they'll get a chance to edit the commit
message (which some will do and not provide any hint that the commit
was done for merging purposes), and thus bypass this check.