add commit entry and remove readme changes

1 files changed, 30 insertions, 8 deletions

diff --git a/lib/git.js b/lib/git.js
index 5693880f..1cf9121d 100644
--- a/lib/git.js
+++ b/lib/git.js
@@ -14,22 +14,29 @@ var Git = function(faker) {
   self.branch = function() {
     var noun = faker.hacker.noun().replace(' ', '-');
     var verb = faker.hacker.verb().replace(' ', '-');
-    return 'noun' + '-' + 'verb';
+    return noun + '-' + verb;
   }
 
   /**
-   * commitSha
+   * commitEntry
    *
-   * @method faker.git.commitSha
+   * @method faker.git.commitEntry
+   * @param {object} options
    */
-  self.commitSha = function() {
-    var commit = "";
+  self.commitEntry = function(options) {
+    options = options || {};
 
-    for (var i = 0; i < 40; i++) {
-      commit += faker.random.alphaNumeric();
+    var entry = 'commit {{git.commitSha}}\r\n';
+
+    if (options.merge || (faker.random.number({ min: 0, max: 4 }) === 0)) {
+      entry += 'Merge: {{git.shortSha}} {{git.shortSha}}\r\n';
     }
 
-    return commit;
+    entry += 'Author: {{name.firstName}} {{name.lastName}} <{{internet.email}}>\r\n';
+    entry += 'Date: ' + faker.date.recent().toString() + '\r\n';
+    entry += '\r\n\xa0\xa0\xa0\xa0{{git.commitMessage}}\r\n';
+
+    return f(entry);
   };
 
   /**
@@ -43,6 +50,21 @@ var Git = function(faker) {
   };
 
   /**
+   * commitSha
+   *
+   * @method faker.git.commitSha
+   */
+  self.commitSha = function() {
+    var commit = "";
+
+    for (var i = 0; i < 40; i++) {
+      commit += faker.random.alphaNumeric();
+    }
+
+    return commit;
+  };
+
+  /**
    * shortSha
    *
    * @method faker.git.shortSha