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?
> (develop)>$ git merge --no-commit --stat -v widget_twitter
> Automatic merge went well; stopped before committing as requested
> (develop|MERGING)>$ git merge --abort
> (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(-)
> (develop)>$ git --version
> git version 184.108.40.206
(please respond to the list as opposed to my email box directly,
unless you are supplying private information you don't want public
on the list)
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html