On Wed, Jul 28, 2010 at 04:49:11PM -0400, Avery Pennarun wrote:
> It sounds like --log and -m are currently incompatible, in that -m
> overrides --log, and that's not the desired behaviour. Bradley: this
> is probably a relatively easy fix to make, in case you're looking to
> get into some git hacking. :)
Really? I get:
$ mkdir repo && cd repo && git init &&
echo content >file && git add file && git commit -m one &&
echo content >>file && git commit -a -m two &&
git checkout -b other HEAD^ &&
echo content >file2 && git add file2 && git commit -m three &&
git merge --log -m "custom message" master &&
git show
commit fa21035ea5f5437e8664a5d249e7ab88ee3f0e75
Merge: d12be4a 4dc5cba
Author: Jeff King <peff@xxxxxxxx>
Date: Wed Jul 28 20:50:39 2010 -0400
custom message
* master:
two
which seems to be what was asked for. So is the problem just that
git-pull does not take "-m"?
-Peff
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html