You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2013/05/08 15:50:34 UTC
[2/3] git commit: [CB-3305] Use --no-merges when creating changelog
[CB-3305] Use --no-merges when creating changelog
Project: http://git-wip-us.apache.org/repos/asf/cordova-coho/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-coho/commit/1c8caf30
Tree: http://git-wip-us.apache.org/repos/asf/cordova-coho/tree/1c8caf30
Diff: http://git-wip-us.apache.org/repos/asf/cordova-coho/diff/1c8caf30
Branch: refs/heads/master
Commit: 1c8caf307a161668ad2cc8184c5c8264762781c3
Parents: ad7b7d6
Author: Andrew Grieve <ag...@chromium.org>
Authored: Tue May 7 09:50:21 2013 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Wed May 8 09:50:21 2013 -0400
----------------------------------------------------------------------
coho | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-coho/blob/1c8caf30/coho
----------------------------------------------------------------------
diff --git a/coho b/coho
index c42096c..30e1100 100755
--- a/coho
+++ b/coho
@@ -287,7 +287,7 @@ function createReleaseCommand(argv) {
var changeLogData = 'Cordova Commits from ' + prevVersion + ' -> ' + newVersion + '\n';
forEachRepo(repos, function(repo) {
changeLogData += '\n' + repo.repoName + '\n---\n';
- changeLogData += execHelper('git log --format="%h %s" ' + prevVersion + '..' + newVersion, true);
+ changeLogData += execHelper('git log --no-merges --format="%h %s" ' + prevVersion + '..' + newVersion, true);
});
fs.writeFileSync(path.join(destDir, 'changelog'), changeLogData);
console.log('Generating final zip...');