On Mon, Oct 29, 2012 at 02:12:32PM -0400, Phil Hord wrote:
> >> (develop)>$ git merge widget_twitter
> >> Merge made by the 'recursive' strategy.
> >> .../code/community/Dnd/Magentweet/Model/User.php |3 ++-
> >> 1 files changed, 2 insertions(+), 1 deletions(-)
> >
> > Whereas here you do,
On Sun, Oct 28, 2012 at 7:21 AM, Jeff King wrote:
> On Mon, Oct 22, 2012 at 09:39:31AM -0400, Scott R. Godin wrote:
>
>> As you can see from the below, I can't seem to get it to give me more
>> verbose results of what's being merged (as in the actual merge below)
>> with --stat or -v .. is it supp
On Mon, Oct 22, 2012 at 09:39:31AM -0400, Scott R. Godin wrote:
> As you can see from the below, I can't seem to get it to give me more
> verbose results of what's being merged (as in the actual merge below)
> with --stat or -v .. is it supposed to do that?
Yes. The diffstat is shown for the comp
Looks like I got lost in the press of other issues. anyone?
On 10/22/2012 09:39 AM, Scott R. Godin wrote:
> As you can see from the below, I can't seem to get it to give me more
> verbose results of what's being merged (as in the actual merge below)
> with --stat or -v .. is it supposed to do that
As you can see from the below, I can't seem to get it to give me more
verbose results of what's being merged (as in the actual merge below)
with --stat or -v .. is it supposed to do that?
(develop)>$ git merge --no-commit --stat -v widget_twitter
Automatic merge went well; stopped before committin
5 matches
Mail list logo