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

On 04/21/2009 06:18 PM, Elijah Newren wrote:
On Mon, Apr 20, 2009 at 8:40 PM, Behdad Esfahbod<behdad behdad org>  wrote:

-------- Original Message --------
Oh, you did a 'merge-commit'. I did one of those to 'gtk+', no less...
The technical description is at
and apparently, now, 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.

Right. I didn't notice that the commit message does not match the autogenerated ones.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]