[Bps-public-commit] App-Changeloggr branch, master, updated. af4cf11c810af5d8e1e4bc2696cb9c3c67306ddd

[sartak at bestpractical.com]

The branch, master has been updated
       via  af4cf11c810af5d8e1e4bc2696cb9c3c67306ddd (commit)
      from  d8f521ca8d1c5ba62b7e7c355e90869c79772011 (commit)

Summary of changes:
 lib/App/Changeloggr/View/Admin.pm |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

- Log -----------------------------------------------------------------
commit af4cf11c810af5d8e1e4bc2696cb9c3c67306ddd
Author: Shawn M Moore <sartak at gmail.com>
Date:   Tue Aug 4 16:10:55 2009 -0400

    Advise users to use --no-merges for git

diff --git a/lib/App/Changeloggr/View/Admin.pm b/lib/App/Changeloggr/View/Admin.pm
index c422dad..7f83b90 100644
--- a/lib/App/Changeloggr/View/Admin.pm
+++ b/lib/App/Changeloggr/View/Admin.pm
@@ -151,7 +151,7 @@ sub add_changes_to {
     p {
         outs 'We accept the following log formats.';
         ul {
-            li { tt { 'git log --pretty=fuller --stat --reverse' }};
+            li { tt { 'git log --pretty=fuller --stat --reverse --no-merges' }};
             li { tt { 'svn log' }};
             li { tt { 'svn log --xml' }};
         }

-----------------------------------------------------------------------