Re: merge --no-commit not able to report stats more verbosely?
On Sun, Oct 28, 2012 at 7:21 AM, Jeff King p...@peff.net 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 supposed to do that? Yes. The diffstat is shown for the completed merge, but here: (develop)$ git merge --no-commit --stat -v widget_twitter Automatic merge went well; stopped before committing as requested You do not complete the merge. (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(-) Whereas here you do, and you get a diffstat. When you are in the middle of an uncompleted merge and want to know what is happening, you should look at the index using git status (to get an overview of what is ready to be committed and what is unmerged), git diff --cached (to see what was automatically merged and is ready for commit), and git diff (to see conflicted entries that still need to be resolved). I think he is looking for this bit Merge made by the 'recursive' strategy. But he is seeing this instead: Automatic merge went well; stopped before committing as requested Should the what happened output be silenced on --no-commit? Phil -- 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
Re: merge --no-commit not able to report stats more verbosely?
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 completed merge, but here: (develop)$ git merge --no-commit --stat -v widget_twitter Automatic merge went well; stopped before committing as requested You do not complete the merge. (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(-) Whereas here you do, and you get a diffstat. When you are in the middle of an uncompleted merge and want to know what is happening, you should look at the index using git status (to get an overview of what is ready to be committed and what is unmerged), git diff --cached (to see what was automatically merged and is ready for commit), and git diff (to see conflicted entries that still need to be resolved). -Peff -- 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
Re: merge --no-commit not able to report stats more verbosely?
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 1.7.7.6 -- (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
