more changelog changes

nandub · Mar 17, 2020 · 7d0eb42 · 7d0eb42
1 parent 3148103
commit 7d0eb42
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## Current - 2020-03-16
-- [View Commit](https://github.com/nandub/hubot-irc/commit/7e4f997064cd36e21ff1021e0df6887dc9553f42) fix markdown commit list
+- [View Commit](https://github.com/nandub/hubot-irc/commit/3148103b101d14afb2420bec8cfe2a6cdfe8e61f) pass version arg to release/changelog
+ - [View Commit](https://github.com/nandub/hubot-irc/commit/7e4f997064cd36e21ff1021e0df6887dc9553f42) fix markdown commit list
  - [View Commit](https://github.com/nandub/hubot-irc/commit/39b064d20d7ebdf150b2508d2b831c11e42a899d) fix url markdown
  - [View Commit](https://github.com/nandub/hubot-irc/commit/d4b35d6b1fbc9708f1d6245b9a950237f814a159) remove ruby dependency
  - [View Commit](https://github.com/nandub/hubot-irc/commit/7688bfaa6f59552ffd920a695bd7477a40e9cd50) add test folder

diff --git a/release/changelog b/release/changelog
@@ -29,8 +29,8 @@ function get_version_date() {
 function get_commit_since_tag() {
   local new_tag=$1
   local old_tag=$2
-  git log $old_tag...$new_tag --pretty=format:'- [View Commit](https://github.com/nandub/hubot-irc/commit/%H) %s@' | grep -v Merge
-  #git log $old_tag...$new_tag --pretty=format:'<li> <a href="https://github.com/nandub/hubot-irc/commit/%H">view commit &bull;</a> %s</li>@' | grep -v Merge
+  git log $old_tag...$new_tag --pretty=format:'- [View Commit](https://github.com/nandub/hubot-irc/commit/%H) %s@' | grep -wv 'Merge'
+  #git log $old_tag...$new_tag --pretty=format:'<li> <a href="https://github.com/nandub/hubot-irc/commit/%H">view commit &bull;</a> %s</li>@' | grep -wv 'Merge'
 }
 
 versions